Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tighten up Binder.clearCallingIdentity() usage.

Browse Source 
This is a third CL in a chain that adjusts existing malformed code
to follow AndroidFrameworkBinderIdentity best-practices.

Specifically, if a thread clears an identity they need to restore it
to avoid obscure security vulnerabilities.  In addition, the relevant
"try" block must start immediately after the identity is cleared to
ensure that its restored if/when any exceptions are thrown.

Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I74cb958b68d55a647547aae21baff6ddc364859b
This commit is contained in:
Jeff Sharkey
2020-10-06 14:54:58 -06:00
parent b381789fa8
commit b93712f623
21 changed files with 227 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/java/android/app/backup/BackupAgent.java
View File

@@ -1054,14 +1054,15 @@ public abstract class BackupAgent extends ContextWrapper {
long quotaBytes,
IBackupCallback callbackBinder,
int transportFlags) throws RemoteException {
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
if (DEBUG) Log.v(TAG, "doBackup() invoked");
BackupDataOutput output = new BackupDataOutput(
data.getFileDescriptor(), quotaBytes, transportFlags);
long result = RESULT_ERROR;
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
try {
BackupAgent.this.onBackup(oldState, output, newState);
result = RESULT_SUCCESS;
@@ -1111,9 +1112,6 @@ public abstract class BackupAgent extends ContextWrapper {
private void doRestoreInternal(ParcelFileDescriptor data, long appVersionCode,
ParcelFileDescriptor newState, int token, IBackupManager callbackBinder,
List<String> excludedKeys) throws RemoteException {
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
if (DEBUG) Log.v(TAG, "doRestore() invoked");
// Ensure that any side-effect SharedPreferences writes have landed *before*
@@ -1121,6 +1119,9 @@ public abstract class BackupAgent extends ContextWrapper {
waitForSharedPrefs();
BackupDataInput input = new BackupDataInput(data.getFileDescriptor());
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
try {
BackupAgent.this.onRestore(input, appVersionCode, newState,
excludedKeys != null ? new HashSet<>(excludedKeys)
@@ -1152,15 +1153,14 @@ public abstract class BackupAgent extends ContextWrapper {
@Override
public void doFullBackup(ParcelFileDescriptor data,
long quotaBytes, int token, IBackupManager callbackBinder, int transportFlags) {
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
if (DEBUG) Log.v(TAG, "doFullBackup() invoked");
// Ensure that any SharedPreferences writes have landed *before*
// we potentially try to back up the underlying files directly.
waitForSharedPrefs();
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
try {
BackupAgent.this.onFullBackup(new FullBackupDataOutput(
data, quotaBytes, transportFlags));
@@ -1199,12 +1199,13 @@ public abstract class BackupAgent extends ContextWrapper {
public void doMeasureFullBackup(long quotaBytes, int token, IBackupManager callbackBinder,
int transportFlags) {
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
FullBackupDataOutput measureOutput =
new FullBackupDataOutput(quotaBytes, transportFlags);
waitForSharedPrefs();
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
try {
BackupAgent.this.onFullBackup(measureOutput);
} catch (IOException ex) {
@@ -1284,9 +1285,10 @@ public abstract class BackupAgent extends ContextWrapper {
long backupDataBytes,
long quotaBytes,
IBackupCallback callbackBinder) {
final long ident = Binder.clearCallingIdentity();
long result = RESULT_ERROR;
// Ensure that we're running with the app's normal permission level
final long ident = Binder.clearCallingIdentity();
try {
BackupAgent.this.onQuotaExceeded(backupDataBytes, quotaBytes);
result = RESULT_SUCCESS;

56
core/java/android/bluetooth/BluetoothHidDevice.java
View File

@@ -342,44 +342,72 @@ public final class BluetoothHidDevice implements BluetoothProfile {
@Override
public void onAppStatusChanged(BluetoothDevice pluggedDevice, boolean registered) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onAppStatusChanged(pluggedDevice, registered));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onAppStatusChanged(pluggedDevice, registered));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onConnectionStateChanged(BluetoothDevice device, int state) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onConnectionStateChanged(device, state));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onConnectionStateChanged(device, state));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onGetReport(BluetoothDevice device, byte type, byte id, int bufferSize) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onGetReport(device, type, id, bufferSize));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onGetReport(device, type, id, bufferSize));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onSetReport(BluetoothDevice device, byte type, byte id, byte[] data) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onSetReport(device, type, id, data));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onSetReport(device, type, id, data));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onSetProtocol(BluetoothDevice device, byte protocol) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onSetProtocol(device, protocol));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onSetProtocol(device, protocol));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onInterruptData(BluetoothDevice device, byte reportId, byte[] data) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onInterruptData(device, reportId, data));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onInterruptData(device, reportId, data));
} finally {
restoreCallingIdentity(token);
}
}
@Override
public void onVirtualCableUnplug(BluetoothDevice device) {
clearCallingIdentity();
mExecutor.execute(() -> mCallback.onVirtualCableUnplug(device));
final long token = clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onVirtualCableUnplug(device));
} finally {
restoreCallingIdentity(token);
}
}
}

1
core/java/android/content/ContentProvider.java
View File

@@ -1043,6 +1043,7 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall
* calling identity by passing it to
* {@link #restoreCallingIdentity}.
*/
@SuppressWarnings("AndroidFrameworkBinderIdentity")
public final @NonNull CallingIdentity clearCallingIdentity() {
return new CallingIdentity(Binder.clearCallingIdentity(), setCallingPackage(null));
}

3
core/java/android/hardware/camera2/impl/CameraDeviceImpl.java
View File

@@ -1587,7 +1587,7 @@ public class CameraDeviceImpl extends CameraDevice
}
switch (errorCode) {
case CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED:
case CameraDeviceCallbacks.ERROR_CAMERA_DISCONNECTED: {
final long ident = Binder.clearCallingIdentity();
try {
mDeviceExecutor.execute(mCallOnDisconnected);
@@ -1595,6 +1595,7 @@ public class CameraDeviceImpl extends CameraDevice
Binder.restoreCallingIdentity(ident);
}
break;
}
case CameraDeviceCallbacks.ERROR_CAMERA_REQUEST:
case CameraDeviceCallbacks.ERROR_CAMERA_RESULT:
case CameraDeviceCallbacks.ERROR_CAMERA_BUFFER:

3
core/java/android/hardware/camera2/impl/CameraOfflineSessionImpl.java
View File

@@ -147,7 +147,7 @@ public class CameraOfflineSessionImpl extends CameraOfflineSession
case CameraDeviceCallbacks.ERROR_CAMERA_BUFFER:
onCaptureErrorLocked(errorCode, resultExtras);
break;
default:
default: {
Runnable errorDispatch = new Runnable() {
@Override
public void run() {
@@ -164,6 +164,7 @@ public class CameraOfflineSessionImpl extends CameraOfflineSession
} finally {
Binder.restoreCallingIdentity(ident);
}
}
}
}
}

24
core/java/android/hardware/hdmi/HdmiControlManager.java
View File

@@ -1006,8 +1006,12 @@ public final class HdmiControlManager {
return new IHdmiHotplugEventListener.Stub() {
@Override
public void onReceived(HdmiHotplugEvent event) {
Binder.clearCallingIdentity();
executor.execute(() -> listener.onReceived(event));
final long token = Binder.clearCallingIdentity();
try {
executor.execute(() -> listener.onReceived(event));
} finally {
Binder.restoreCallingIdentity(token);
}
}
};
}
@@ -1098,8 +1102,12 @@ public final class HdmiControlManager {
return new IHdmiControlStatusChangeListener.Stub() {
@Override
public void onStatusChange(boolean isCecEnabled, boolean isCecAvailable) {
Binder.clearCallingIdentity();
executor.execute(() -> listener.onStatusChange(isCecEnabled, isCecAvailable));
final long token = Binder.clearCallingIdentity();
try {
executor.execute(() -> listener.onStatusChange(isCecEnabled, isCecAvailable));
} finally {
Binder.restoreCallingIdentity(token);
}
}
};
}
@@ -1171,8 +1179,12 @@ public final class HdmiControlManager {
return new android.hardware.hdmi.IHdmiCecVolumeControlFeatureListener.Stub() {
@Override
public void onHdmiCecVolumeControlFeature(boolean enabled) {
Binder.clearCallingIdentity();
executor.execute(() -> listener.onHdmiCecVolumeControlFeature(enabled));
final long token = Binder.clearCallingIdentity();
try {
executor.execute(() -> listener.onHdmiCecVolumeControlFeature(enabled));
} finally {
Binder.restoreCallingIdentity(token);
}
}
};
}

24
core/java/android/net/NetworkScoreManager.java
View File

@@ -511,18 +511,26 @@ public class NetworkScoreManager {
@Override
public void updateScores(@NonNull List<ScoredNetwork> networks) {
Binder.clearCallingIdentity();
mExecutor.execute(() -> {
mCallback.onScoresUpdated(networks);
});
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> {
mCallback.onScoresUpdated(networks);
});
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override
public void clearScores() {
Binder.clearCallingIdentity();
mExecutor.execute(() -> {
mCallback.onScoresInvalidated();
});
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> {
mCallback.onScoresInvalidated();
});
} finally {
Binder.restoreCallingIdentity(token);
}
}
}

4
core/java/android/os/Binder.java
View File

@@ -391,8 +391,8 @@ public class Binder implements IBinder {
* @hide
*/
public static final void withCleanCallingIdentity(@NonNull ThrowingRunnable action) {
final long callingIdentity = clearCallingIdentity();
Throwable throwableToPropagate = null;
final long callingIdentity = clearCallingIdentity();
try {
action.runOrThrow();
} catch (Throwable throwable) {
@@ -415,8 +415,8 @@ public class Binder implements IBinder {
* @hide
*/
public static final <T> T withCleanCallingIdentity(@NonNull ThrowingSupplier<T> action) {
final long callingIdentity = clearCallingIdentity();
Throwable throwableToPropagate = null;
final long callingIdentity = clearCallingIdentity();
try {
return action.getOrThrow();
} catch (Throwable throwable) {

2
core/java/android/os/Looper.java
View File

@@ -155,6 +155,7 @@ public final class Looper {
/**
* Poll and deliver single message, return true if the outer loop should continue.
*/
@SuppressWarnings("AndroidFrameworkBinderIdentity")
private static boolean loopOnce(final Looper me,
final long ident, final int thresholdOverride) {
Message msg = me.mQueue.next(); // might block
@@ -255,6 +256,7 @@ public final class Looper {
* Run the message queue in this thread. Be sure to call
* {@link #quit()} to end the loop.
*/
@SuppressWarnings("AndroidFrameworkBinderIdentity")
public static void loop() {
final Looper me = myLooper();
if (me == null) {

12
core/java/android/view/accessibility/AccessibilityInteractionClient.java
View File

@@ -441,8 +441,8 @@ public final class AccessibilityInteractionClient
prefetchFlags &= ~AccessibilityNodeInfo.FLAG_PREFETCH_MASK;
}
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final String[] packageNames;
final long identityToken = Binder.clearCallingIdentity();
try {
packageNames = connection.findAccessibilityNodeInfoByAccessibilityId(
accessibilityWindowId, accessibilityNodeId, interactionId, this,
@@ -501,8 +501,8 @@ public final class AccessibilityInteractionClient
IAccessibilityServiceConnection connection = getConnection(connectionId);
if (connection != null) {
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final String[] packageNames;
final long identityToken = Binder.clearCallingIdentity();
try {
packageNames = connection.findAccessibilityNodeInfosByViewId(
accessibilityWindowId, accessibilityNodeId, viewId, interactionId, this,
@@ -555,8 +555,8 @@ public final class AccessibilityInteractionClient
IAccessibilityServiceConnection connection = getConnection(connectionId);
if (connection != null) {
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final String[] packageNames;
final long identityToken = Binder.clearCallingIdentity();
try {
packageNames = connection.findAccessibilityNodeInfosByText(
accessibilityWindowId, accessibilityNodeId, text, interactionId, this,
@@ -608,8 +608,8 @@ public final class AccessibilityInteractionClient
IAccessibilityServiceConnection connection = getConnection(connectionId);
if (connection != null) {
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final String[] packageNames;
final long identityToken = Binder.clearCallingIdentity();
try {
packageNames = connection.findFocus(accessibilityWindowId,
accessibilityNodeId, focusType, interactionId, this,
@@ -657,8 +657,8 @@ public final class AccessibilityInteractionClient
IAccessibilityServiceConnection connection = getConnection(connectionId);
if (connection != null) {
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final String[] packageNames;
final long identityToken = Binder.clearCallingIdentity();
try {
packageNames = connection.focusSearch(accessibilityWindowId,
accessibilityNodeId, direction, interactionId, this,
@@ -705,8 +705,8 @@ public final class AccessibilityInteractionClient
IAccessibilityServiceConnection connection = getConnection(connectionId);
if (connection != null) {
final int interactionId = mInteractionIdCounter.getAndIncrement();
final long identityToken = Binder.clearCallingIdentity();
final boolean success;
final long identityToken = Binder.clearCallingIdentity();
try {
success = connection.performAccessibilityAction(
accessibilityWindowId, accessibilityNodeId, action, arguments,

12
media/java/android/media/midi/MidiDeviceServer.java
View File

@@ -385,13 +385,13 @@ public final class MidiDeviceServer implements Closeable {
private void updateDeviceStatus() {
// clear calling identity, since we may be in a Binder call from one of our clients
final long identityToken = Binder.clearCallingIdentity();
MidiDeviceStatus status = new MidiDeviceStatus(mDeviceInfo, mInputPortOpen,
mOutputPortOpenCount);
if (mCallback != null) {
mCallback.onDeviceStatusChanged(this, status);
}
try {
MidiDeviceStatus status = new MidiDeviceStatus(mDeviceInfo, mInputPortOpen,
mOutputPortOpenCount);
if (mCallback != null) {
mCallback.onDeviceStatusChanged(this, status);
}
mMidiManager.setDeviceStatus(mServer, status);
} catch (RemoteException e) {
Log.e(TAG, "RemoteException in updateDeviceStatus");

2
media/java/android/media/permission/ClearCallingIdentityContext.java
View File

@@ -47,11 +47,13 @@ public class ClearCallingIdentityContext implements SafeCloseable {
return new ClearCallingIdentityContext();
}
@SuppressWarnings("AndroidFrameworkBinderIdentity")
private ClearCallingIdentityContext() {
mRestoreKey = Binder.clearCallingIdentity();
}
@Override
@SuppressWarnings("AndroidFrameworkBinderIdentity")
public void close() {
Binder.restoreCallingIdentity(mRestoreKey);
}

4
services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java
View File

@@ -2073,9 +2073,9 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
private void updateAccessibilityEnabledSettingLocked(AccessibilityUserState userState) {
final long identity = Binder.clearCallingIdentity();
final boolean isA11yEnabled = mUiAutomationManager.isUiAutomationRunningLocked()
|| userState.isHandlingAccessibilityEventsLocked();
final long identity = Binder.clearCallingIdentity();
try {
Settings.Secure.putIntForUser(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_ENABLED,
@@ -2384,8 +2384,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
int numServices = services.size();
for (int i = 0; i < numServices; i++) {
if (services.get(i).isCapturingFingerprintGestures()) {
final long identity = Binder.clearCallingIdentity();
IFingerprintService service = null;
final long identity = Binder.clearCallingIdentity();
try {
service = IFingerprintService.Stub.asInterface(
ServiceManager.getService(Context.FINGERPRINT_SERVICE));

43
services/accessibility/java/com/android/server/accessibility/SystemActionPerformer.java
View File

@@ -308,14 +308,15 @@ public class SystemActionPerformer {
private void sendDownAndUpKeyEvents(int keyCode) {
final long token = Binder.clearCallingIdentity();
// Inject down.
final long downTime = SystemClock.uptimeMillis();
sendKeyEventIdentityCleared(keyCode, KeyEvent.ACTION_DOWN, downTime, downTime);
sendKeyEventIdentityCleared(
keyCode, KeyEvent.ACTION_UP, downTime, SystemClock.uptimeMillis());
Binder.restoreCallingIdentity(token);
try {
// Inject down.
final long downTime = SystemClock.uptimeMillis();
sendKeyEventIdentityCleared(keyCode, KeyEvent.ACTION_DOWN, downTime, downTime);
sendKeyEventIdentityCleared(
keyCode, KeyEvent.ACTION_UP, downTime, SystemClock.uptimeMillis());
} finally {
Binder.restoreCallingIdentity(token);
}
}
private void sendKeyEventIdentityCleared(int keyCode, int action, long downTime, long time) {
@@ -329,22 +330,24 @@ public class SystemActionPerformer {
private void expandNotifications() {
final long token = Binder.clearCallingIdentity();
StatusBarManager statusBarManager = (StatusBarManager) mContext.getSystemService(
android.app.Service.STATUS_BAR_SERVICE);
statusBarManager.expandNotificationsPanel();
Binder.restoreCallingIdentity(token);
try {
StatusBarManager statusBarManager = (StatusBarManager) mContext.getSystemService(
android.app.Service.STATUS_BAR_SERVICE);
statusBarManager.expandNotificationsPanel();
} finally {
Binder.restoreCallingIdentity(token);
}
}
private void expandQuickSettings() {
final long token = Binder.clearCallingIdentity();
StatusBarManager statusBarManager = (StatusBarManager) mContext.getSystemService(
android.app.Service.STATUS_BAR_SERVICE);
statusBarManager.expandSettingsPanel();
Binder.restoreCallingIdentity(token);
try {
StatusBarManager statusBarManager = (StatusBarManager) mContext.getSystemService(
android.app.Service.STATUS_BAR_SERVICE);
statusBarManager.expandSettingsPanel();
} finally {
Binder.restoreCallingIdentity(token);
}
}
private boolean openRecents() {

2
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -1412,8 +1412,8 @@ public class BackupManagerService extends IBackupManager.Stub {
return null;
}
int callingUserId = Binder.getCallingUserHandle().getIdentifier();
final long oldId = Binder.clearCallingIdentity();
final int[] userIds;
final long oldId = Binder.clearCallingIdentity();
try {
userIds = getUserManager().getProfileIds(callingUserId, false);
} finally {

20
services/backup/java/com/android/server/backup/UserBackupManagerService.java
View File

@@ -2890,15 +2890,17 @@ public class UserBackupManagerService {
return;
}
final long oldId = Binder.clearCallingIdentity();
OnTaskFinishedListener listener =
caller ->
mTransportManager.disposeOfTransportClient(transportClient, caller);
mWakelock.acquire();
Message msg = mBackupHandler.obtainMessage(
MSG_RUN_CLEAR,
new ClearParams(transportClient, info, listener));
mBackupHandler.sendMessage(msg);
Binder.restoreCallingIdentity(oldId);
try {
OnTaskFinishedListener listener = caller -> mTransportManager
.disposeOfTransportClient(transportClient, caller);
mWakelock.acquire();
Message msg = mBackupHandler.obtainMessage(
MSG_RUN_CLEAR,
new ClearParams(transportClient, info, listener));
mBackupHandler.sendMessage(msg);
} finally {
Binder.restoreCallingIdentity(oldId);
}
}
}
}

2
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -1148,10 +1148,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
return mContext.getSystemService(WifiManager.class);
}
@SuppressWarnings("AndroidFrameworkBinderIdentity")
long binderClearCallingIdentity() {
return Binder.clearCallingIdentity();
}
@SuppressWarnings("AndroidFrameworkBinderIdentity")
void binderRestoreCallingIdentity(long token) {
Binder.restoreCallingIdentity(token);
}

2
services/net/java/android/net/ip/IpClientManager.java
View File

@@ -87,6 +87,8 @@ public class IpClientManager {
} catch (RemoteException e) {
log("Error confirming IpClient configuration", e);
return false;
} finally {
Binder.restoreCallingIdentity(token);
}
}

29
services/usb/java/com/android/server/usb/UsbUserPermissionManager.java
View File

@@ -506,21 +506,22 @@ class UsbUserPermissionManager {
@NonNull Context userContext,
@NonNull PendingIntent pi) {
final long identity = Binder.clearCallingIdentity();
Intent intent = new Intent();
if (device != null) {
intent.putExtra(UsbManager.EXTRA_DEVICE, device);
} else {
intent.putExtra(UsbManager.EXTRA_ACCESSORY, accessory);
}
intent.putExtra(Intent.EXTRA_INTENT, pi);
intent.putExtra(Intent.EXTRA_UID, uid);
intent.putExtra(UsbManager.EXTRA_CAN_BE_DEFAULT, canBeDefault);
intent.putExtra(UsbManager.EXTRA_PACKAGE, packageName);
intent.setComponent(ComponentName.unflattenFromString(userContext.getResources().getString(
com.android.internal.R.string.config_usbPermissionActivity)));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
try {
Intent intent = new Intent();
if (device != null) {
intent.putExtra(UsbManager.EXTRA_DEVICE, device);
} else {
intent.putExtra(UsbManager.EXTRA_ACCESSORY, accessory);
}
intent.putExtra(Intent.EXTRA_INTENT, pi);
intent.putExtra(Intent.EXTRA_UID, uid);
intent.putExtra(UsbManager.EXTRA_CAN_BE_DEFAULT, canBeDefault);
intent.putExtra(UsbManager.EXTRA_PACKAGE, packageName);
intent.setComponent(
ComponentName.unflattenFromString(userContext.getResources().getString(
com.android.internal.R.string.config_usbPermissionActivity)));
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
userContext.startActivityAsUser(intent, mUser);
} catch (ActivityNotFoundException e) {
Slog.e(TAG, "unable to start UsbPermissionActivity");

2
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

@@ -1039,8 +1039,8 @@ public class VoiceInteractionManagerService extends SystemService {
}
final int callingUserId = UserHandle.getCallingUserId();
final long caller = Binder.clearCallingIdentity();
boolean deleted = false;
final long caller = Binder.clearCallingIdentity();
try {
SoundTriggerSession session = mLoadedKeyphraseIds.get(keyphraseId);
if (session != null) {

75
wifi/java/android/net/wifi/nl80211/WifiNl80211Manager.java
View File

@@ -153,15 +153,23 @@ public class WifiNl80211Manager {
@Override
public void OnScanResultReady() {
Log.d(TAG, "Scan result ready event");
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onScanResultReady());
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onScanResultReady());
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override
public void OnScanFailed() {
Log.d(TAG, "Scan failed event");
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onScanFailed());
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onScanFailed());
} finally {
Binder.restoreCallingIdentity(token);
}
}
}
@@ -345,15 +353,23 @@ public class WifiNl80211Manager {
@Override
public void OnPnoNetworkFound() {
Log.d(TAG, "Pno scan result event");
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onScanResultReady());
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onScanResultReady());
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override
public void OnPnoScanFailed() {
Log.d(TAG, "Pno Scan failed event");
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onScanFailed());
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onScanFailed());
} finally {
Binder.restoreCallingIdentity(token);
}
}
}
@@ -376,15 +392,24 @@ public class WifiNl80211Manager {
+ client.getMacAddress() + " isConnected: " + isConnected);
}
Binder.clearCallingIdentity();
mExecutor.execute(() -> mSoftApListener.onConnectedClientsChanged(client, isConnected));
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(
() -> mSoftApListener.onConnectedClientsChanged(client, isConnected));
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override
public void onSoftApChannelSwitched(int frequency, int bandwidth) {
Binder.clearCallingIdentity();
mExecutor.execute(() -> mSoftApListener.onSoftApChannelSwitched(frequency,
toFrameworkBandwidth(bandwidth)));
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mSoftApListener.onSoftApChannelSwitched(frequency,
toFrameworkBandwidth(bandwidth)));
} finally {
Binder.restoreCallingIdentity(token);
}
}
private @WifiAnnotations.Bandwidth int toFrameworkBandwidth(int bandwidth) {
@@ -437,8 +462,12 @@ public class WifiNl80211Manager {
if (mVerboseLoggingEnabled) {
Log.e(TAG, "Timed out waiting for ACK");
}
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onFailure(SEND_MGMT_FRAME_ERROR_TIMEOUT));
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onFailure(SEND_MGMT_FRAME_ERROR_TIMEOUT));
} finally {
Binder.restoreCallingIdentity(token);
}
});
mWasCalled = false;
@@ -453,8 +482,12 @@ public class WifiNl80211Manager {
// post to main thread
mEventHandler.post(() -> runIfFirstCall(() -> {
mAlarmManager.cancel(mTimeoutCallback);
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onAck(elapsedTimeMs));
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onAck(elapsedTimeMs));
} finally {
Binder.restoreCallingIdentity(token);
}
}));
}
@@ -464,8 +497,12 @@ public class WifiNl80211Manager {
// post to main thread
mEventHandler.post(() -> runIfFirstCall(() -> {
mAlarmManager.cancel(mTimeoutCallback);
Binder.clearCallingIdentity();
mExecutor.execute(() -> mCallback.onFailure(reason));
final long token = Binder.clearCallingIdentity();
try {
mExecutor.execute(() -> mCallback.onFailure(reason));
} finally {
Binder.restoreCallingIdentity(token);
}
}));
}
}