Skip to content

Run a virtual iPhone on an Apple Silicon Mac.

Swift

Fix iOS 27 device orientation sink delivery

Jacky19072101fbef
diff --git a/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.h b/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.h
index 8c41e9e7..cd3ac8ed 100644
--- a/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.h
+++ b/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.h
@@ -5,6 +5,7 @@
// The virtual board has no motion coprocessor to classify gravity for
// CMDeviceOrientationManager. Deliver the HID sample to backboardd's own sink.
void VPhoneOrientationSinkInstall(dispatch_queue_t statusQueue, dispatch_block_t statusChanged);
+void VPhoneOrientationSinkRetry(void);
void VPhoneOrientationSinkPublish(id<VPhoneAccelerometerHIDEvent> event);
NSDictionary *VPhoneOrientationSinkStatus(void);
void VPhoneOrientationGateInstall(void);
diff --git a/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.m b/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.m
index 8a15108b..704e35a2 100644
--- a/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.m
+++ b/VPhoneGuestComponents/Accelerometer/VPhoneOrientationSink.m
@@ -12,6 +12,8 @@
@property (nonatomic) NSInteger deliveredOrientation;
@property (nonatomic) uint64_t deliveries;
@property (nonatomic, copy) NSString *error;
+@property (nonatomic, copy) NSString *postSelector;
+@property (nonatomic, copy) NSString *queueIvar;
@end
@implementation VPhoneDeviceOrientationSink
@end
@@ -19,6 +21,25 @@
static VPhoneDeviceOrientationSink *vpOrientationSink;
static void (*vpOriginalServicesMatched)(id, SEL, id, id);
static void (*vpOriginalSetupPipeline)(id, SEL, id);
+static void (*vpOriginalAccelerometerChanged)(id, SEL, id, NSInteger);
+static BOOL vpOrientationInstalled;
+
+static NSString *vpIvarContaining(Class cls, NSString *needle) {
+ for (Class current = cls; current; current = class_getSuperclass(current)) {
+ unsigned count = 0;
+ Ivar *ivars = class_copyIvarList(current, &count);
+ for (unsigned index = 0; index < count; index++) {
+ NSString *name = [NSString stringWithUTF8String:ivar_getName(ivars[index]) ?: ""];
+ if ([name containsString:needle]) {
+ NSString *found = name;
+ free(ivars);
+ return found;
+ }
+ }
+ free(ivars);
+ }
+ return nil;
+}
static void vpOrientationDeliver(void) {
VPhoneDeviceOrientationSink *sink = vpOrientationSink;
@@ -27,15 +48,33 @@ static void vpOrientationDeliver(void) {
@synchronized (sink) { manager = sink.manager; queue = sink.queue; }
if (!manager || !queue)
return;
- dispatch_async(queue, ^{
+ void (^deliver)(void) = ^{
NSInteger orientation;
@synchronized (sink) {
orientation = sink.orientation;
if (manager != sink.manager || orientation == sink.deliveredOrientation)
return;
}
- ((void (*)(id, SEL, NSInteger))objc_msgSend)(manager,
- sel_registerName("_queue_postUpdatedRawAccelerometerDeviceOrientation:"), orientation);
+ NSString *postSelector;
+ @synchronized (sink) { postSelector = sink.postSelector; }
+ SEL selector = sel_registerName(postSelector.UTF8String);
+ if ([postSelector isEqualToString:@"orientationProvider:deviceOrientationMayHaveChanged:changeSource:isDeviceOrientationLocked:"]) {
+ Class managerClass = NSClassFromString(@"BKOrientationManager");
+ SEL shared = sel_registerName("sharedInstance");
+ id provider = [managerClass respondsToSelector:shared]
+ ? ((id (*)(id, SEL))objc_msgSend)(managerClass, shared) : nil;
+ ((void (*)(id, SEL, id, NSInteger, NSInteger, BOOL))objc_msgSend)(
+ manager, selector, provider, orientation, 1, NO);
+ } else if ([postSelector isEqualToString:@"updateDeviceOrientation:changeSource:"]) {
+ // 24A446's implementation tests bit 0 of changeSource before
+ // accepting a raw device orientation. Source 1 is the accelerometer
+ // path; source 0 is treated as a non-raw interface update.
+ ((void (*)(id, SEL, NSInteger, NSInteger))objc_msgSend)(manager, selector, orientation, 1);
+ SEL refresh = sel_registerName("refreshEffectiveDeviceOrientation");
+ if ([manager respondsToSelector:refresh])
+ ((void (*)(id, SEL))objc_msgSend)(manager, refresh);
+ } else
+ ((void (*)(id, SEL, NSInteger))objc_msgSend)(manager, selector, orientation);
dispatch_queue_t statusQueue;
dispatch_block_t changedHandler;
@synchronized (sink) {
@@ -46,13 +85,25 @@ static void vpOrientationDeliver(void) {
}
if (statusQueue && changedHandler)
dispatch_async(statusQueue, changedHandler);
- });
+ };
+ // 24A446's updateDeviceOrientation:changeSource: synchronously dispatches
+ // onto BKOrientationManager's own queue. Calling it from that queue causes
+ // a self-dispatch deadlock and backboardd restart; the older raw-post
+ // selector requires the manager queue instead.
+ NSString *selector;
+ @synchronized (sink) { selector = sink.postSelector; }
+ if ([selector isEqualToString:@"updateDeviceOrientation:changeSource:"])
+ deliver();
+ else
+ dispatch_async(queue, deliver);
}
static void vpOrientationServicesMatched(id manager, SEL selector, id matcher, id services) {
vpOriginalServicesMatched(manager, selector, matcher, services);
- Ivar queueIvar = class_getInstanceVariable(object_getClass(manager), "_queue");
- dispatch_queue_t queue = queueIvar ? object_getIvar(manager, queueIvar) : nil;
+ NSString *queueName;
+ @synchronized (vpOrientationSink) { queueName = vpOrientationSink.queueIvar; }
+ Ivar queueIvar = queueName.length ? class_getInstanceVariable(object_getClass(manager), queueName.UTF8String) : nil;
+ dispatch_queue_t queue = queueIvar ? object_getIvar(manager, queueIvar) : dispatch_get_main_queue();
if (!queue)
return;
@synchronized (vpOrientationSink) {
@@ -66,25 +117,71 @@ static void vpOrientationServicesMatched(id manager, SEL selector, id matcher, i
}
void VPhoneOrientationSinkInstall(dispatch_queue_t statusQueue, dispatch_block_t statusChanged) {
- static dispatch_once_t once;
- dispatch_once(&once, ^{
+ @synchronized (VPhoneDeviceOrientationSink.class) {
+ if (!vpOrientationSink) {
vpOrientationSink = [VPhoneDeviceOrientationSink new];
vpOrientationSink.orientation = 1;
vpOrientationSink.statusQueue = statusQueue;
vpOrientationSink.statusChanged = statusChanged;
vpOrientationSink.error = @"Waiting for the built-in accelerometer match";
+ }
+ if (vpOrientationInstalled)
+ return;
Class cls = NSClassFromString(@"BKOrientationManager");
+ SEL sharedSelector = sel_registerName("sharedInstance");
+ SEL updateSelector = sel_registerName("updateDeviceOrientation:changeSource:");
+ if (cls && [cls respondsToSelector:sharedSelector]) {
+ id manager = ((id (*)(id, SEL))objc_msgSend)(cls, sharedSelector);
+ if (manager && [manager respondsToSelector:updateSelector]) {
+ NSString *queueName = vpIvarContaining(cls, @"queue");
+ Ivar queueIvar = queueName.length ? class_getInstanceVariable(object_getClass(manager), queueName.UTF8String) : nil;
+ dispatch_queue_t queue = queueIvar ? object_getIvar(manager, queueIvar) : dispatch_get_main_queue();
+ @synchronized (vpOrientationSink) {
+ vpOrientationSink.manager = manager;
+ vpOrientationSink.queue = queue;
+ vpOrientationSink.postSelector = NSStringFromSelector(updateSelector);
+ vpOrientationSink.queueIvar = queueName;
+ vpOrientationSink.error = nil;
+ }
+ vpOrientationInstalled = YES;
+ return;
+ }
+ }
+ Class accelerometerClass = NSClassFromString(@"BKAccelerometerInterface");
+ SEL accelerometerShared = sel_registerName("sharedInstance");
+ SEL providerChanged = sel_registerName("orientationProvider:deviceOrientationMayHaveChanged:changeSource:isDeviceOrientationLocked:");
+ if (accelerometerClass && [accelerometerClass respondsToSelector:accelerometerShared]) {
+ id interface = ((id (*)(id, SEL))objc_msgSend)(accelerometerClass, accelerometerShared);
+ if (interface && [interface respondsToSelector:providerChanged]) {
+ @synchronized (vpOrientationSink) {
+ vpOrientationSink.manager = interface;
+ vpOrientationSink.queue = dispatch_get_main_queue();
+ vpOrientationSink.postSelector = NSStringFromSelector(providerChanged);
+ vpOrientationSink.queueIvar = nil;
+ vpOrientationSink.error = nil;
+ }
+ vpOrientationInstalled = YES;
+ return;
+ }
+ }
Method match = class_getInstanceMethod(cls, sel_registerName("matcher:servicesDidMatch:"));
- Method post = class_getInstanceMethod(cls,
- sel_registerName("_queue_postUpdatedRawAccelerometerDeviceOrientation:"));
- if (!match || !post || !class_getInstanceVariable(cls, "_queue") ||
- method_getNumberOfArguments(match) != 4 || method_getNumberOfArguments(post) != 3) {
+ Method post = class_getInstanceMethod(cls, sel_registerName("_queue_postUpdatedRawAccelerometerDeviceOrientation:"));
+ NSString *queueName = vpIvarContaining(cls, @"queue");
+ if (!match || !post || method_getNumberOfArguments(match) != 4 || method_getNumberOfArguments(post) != 3) {
vpOrientationSink.error = @"Native backboardd device-orientation sink unavailable";
return;
}
+ vpOrientationSink.postSelector = @"_queue_postUpdatedRawAccelerometerDeviceOrientation:";
+ vpOrientationSink.queueIvar = queueName;
vpOriginalServicesMatched = (void (*)(id, SEL, id, id))method_setImplementation(
match, (IMP)vpOrientationServicesMatched);
- });
+ vpOrientationInstalled = YES;
+ }
+}
+
+void VPhoneOrientationSinkRetry(void) {
+ if (!vpOrientationInstalled && vpOrientationSink)
+ VPhoneOrientationSinkInstall(vpOrientationSink.statusQueue, vpOrientationSink.statusChanged);
}
void VPhoneOrientationSinkPublish(id<VPhoneAccelerometerHIDEvent> event) {
@@ -118,6 +215,38 @@ NSDictionary *VPhoneOrientationSinkStatus(void) {
// MARK: - SpringBoard's backlight seed
+static BOOL vpSpringBoardScreenIsOn(void) {
+ Class cls = NSClassFromString(@"SBBacklightController");
+ for (NSString *selectorName in @[@"sharedInstanceIfExists", @"sharedInstanceForMainDisplayIfExists"]) {
+ SEL selector = sel_registerName(selectorName.UTF8String);
+ if (![cls respondsToSelector:selector])
+ continue;
+ id controller = ((id (*)(id, SEL))objc_msgSend)(cls, selector);
+ SEL screenIsOn = sel_registerName("screenIsOn");
+ if (controller && [controller respondsToSelector:screenIsOn])
+ return ((BOOL (*)(id, SEL))objc_msgSend)(controller, screenIsOn);
+ }
+ return YES;
+}
+
+static void vpSpringBoardRefreshOrientationGate(id manager) {
+ Ivar backlight = class_getInstanceVariable(object_getClass(manager), "_backlightIsOn");
+ if (backlight)
+ *(BOOL *)((uint8_t *)(__bridge void *)manager + ivar_getOffset(backlight)) = vpSpringBoardScreenIsOn();
+ SEL deferral = sel_registerName("_updateOrientationInputsDeferralAnimated:");
+ if ([manager respondsToSelector:deferral])
+ ((void (*)(id, SEL, BOOL))objc_msgSend)(manager, deferral, NO);
+ SEL updateInputs = sel_registerName("_updateInputs");
+ if ([manager respondsToSelector:updateInputs])
+ ((void (*)(id, SEL))objc_msgSend)(manager, updateInputs);
+}
+
+static void vpSpringBoardAccelerometerChanged(id manager, SEL selector, id accelerometer, NSInteger orientation) {
+ vpSpringBoardRefreshOrientationGate(manager);
+ vpOriginalAccelerometerChanged(manager, selector, accelerometer, orientation);
+ vpSpringBoardRefreshOrientationGate(manager);
+}
+
static void vpOrientationSetupPipeline(id manager, SEL selector, id arbiter) {
vpOriginalSetupPipeline(manager, selector, arbiter);
Class cls = NSClassFromString(@"SBBacklightController");
@@ -139,12 +268,18 @@ static void vpOrientationSetupPipeline(id manager, SEL selector, id arbiter) {
void VPhoneOrientationGateInstall(void) {
Class cls = NSClassFromString(@"SBTraitsEmbeddedDisplayPipelineManager");
Method method = class_getInstanceMethod(cls, sel_registerName("setupDefaultPipelineForArbiter:"));
- if (!method || method_getNumberOfArguments(method) != 3 ||
- !class_getInstanceVariable(cls, "_backlightIsOn") ||
- ![cls instancesRespondToSelector:sel_registerName("_updateOrientationEventsEnabledState")] ||
- ![cls instancesRespondToSelector:sel_registerName("_updateOrientationInputsDeferralAnimated:")]) {
- NSLog(@"[vphone-accelerometer] SpringBoard orientation gate API unavailable");
+ if (method && method_getNumberOfArguments(method) == 3 &&
+ class_getInstanceVariable(cls, "_backlightIsOn") &&
+ [cls instancesRespondToSelector:sel_registerName("_updateOrientationInputsDeferralAnimated:")]) {
+ vpOriginalSetupPipeline = (void (*)(id, SEL, id))method_setImplementation(method, (IMP)vpOrientationSetupPipeline);
+ return;
+ }
+ Method changed = class_getInstanceMethod(cls, sel_registerName("accelerometer:didChangeDeviceOrientation:"));
+ if (changed && method_getNumberOfArguments(changed) == 4 && class_getInstanceVariable(cls, "_backlightIsOn") &&
+ [cls instancesRespondToSelector:sel_registerName("_updateOrientationInputsDeferralAnimated:")]) {
+ vpOriginalAccelerometerChanged = (void (*)(id, SEL, id, NSInteger))method_setImplementation(
+ changed, (IMP)vpSpringBoardAccelerometerChanged);
return;
}
- vpOriginalSetupPipeline = (void (*)(id, SEL, id))method_setImplementation(method, (IMP)vpOrientationSetupPipeline);
+ NSLog(@"[vphone-accelerometer] SpringBoard orientation gate API unavailable");
}
diff --git a/VPhoneGuestComponents/Accelerometer/libvphoneaccelerometer.m b/VPhoneGuestComponents/Accelerometer/libvphoneaccelerometer.m
index d6e4ef90..0a865bf6 100644
--- a/VPhoneGuestComponents/Accelerometer/libvphoneaccelerometer.m
+++ b/VPhoneGuestComponents/Accelerometer/libvphoneaccelerometer.m
@@ -167,6 +167,10 @@
dispatch_resume(self.timer);
dispatch_resume(self.heartbeat);
[self createService];
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), self.queue, ^{
+ VPhoneOrientationSinkRetry();
+ [self publishStatus];
+ });
}
// MARK: - HIDVirtualEventServiceDelegate selectors
@@ -203,6 +207,7 @@
if (service != self.service)
return;
if (type == 10) { // HIDVirtualServiceNotificationTypeEnumerated
+ VPhoneOrientationSinkRetry();
self.enumerated = YES;
self.lastError = nil;
NSLog(@"[vphone-accelerometer] HID service enumerated: %llu", self.service.serviceID);
@@ -221,6 +226,9 @@
__attribute__((constructor)) static void VPhoneAccelerometerStart(void) {
if (strcmp(getprogname(), "SpringBoard") == 0) {
VPhoneOrientationGateInstall();
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+ VPhoneOrientationGateInstall();
+ });
return;
}
// Only backboardd creates the HID service; SpringBoard installs the seed