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

Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev

Browse Source 
am: 59db7b8d01

Change-Id: Ia01b9fe95c175f242b771fa1cb1b33bceecda896
This commit is contained in:
Heemin Seog
2019-09-06 10:49:43 -07:00
committed by android-build-merger
parent 80d3b193eb 59db7b8d01
commit c799b2dcb0
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
View File

@@ -628,6 +628,14 @@ public class StorageNotification extends SystemUI {
final int requestKey = vol.getId().hashCode(); final int requestKey = vol.getId().hashCode();
return PendingIntent.getActivityAsUser(mContext, requestKey, intent, return PendingIntent.getActivityAsUser(mContext, requestKey, intent,
PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT); PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);
} else if (isAutomotive()) {
intent.setClassName("com.android.car.settings",
"com.android.car.settings.storage.StorageUnmountReceiver");
intent.putExtra(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
final int requestKey = vol.getId().hashCode();
return PendingIntent.getBroadcastAsUser(mContext, requestKey, intent,
PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.CURRENT);
} else { } else {
intent.setClassName("com.android.settings", intent.setClassName("com.android.settings",
"com.android.settings.deviceinfo.StorageUnmountReceiver"); "com.android.settings.deviceinfo.StorageUnmountReceiver");
@@ -749,6 +757,11 @@ public class StorageNotification extends SystemUI {
PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT); PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);
} }
private boolean isAutomotive() {
PackageManager packageManager = mContext.getPackageManager();
return packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
}
private boolean isTv() { private boolean isTv() {
PackageManager packageManager = mContext.getPackageManager(); PackageManager packageManager = mContext.getPackageManager();
return packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK); return packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);