Skip to content

Commit 502a47c

Browse files
author
Android Build Coastguard Worker
committed
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23474144', 'googleplex-android-review.googlesource.com/23476871', 'googleplex-android-review.googlesource.com/23733070', 'googleplex-android-review.googlesource.com/23905843', 'googleplex-android-review.googlesource.com/23905120', 'googleplex-android-review.googlesource.com/23834017'] into tm-platform-release.
Change-Id: Ia68282ccf45d558e9631260f2eaf670d6ab854bd
2 parents 835e7a9 + 0a24f79 commit 502a47c

18 files changed

Lines changed: 573 additions & 78 deletions

File tree

‎core/java/android/app/Notification.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2138,6 +2138,10 @@ public Action build() {
21382138
}
21392139
}
21402140

2141+
private void visitUris(@NonNull Consumer<Uri> visitor) {
2142+
visitIconUri(visitor, getIcon());
2143+
}
2144+
21412145
@Override
21422146
public Action clone() {
21432147
return new Action(
@@ -2823,7 +2827,7 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
28232827

28242828
if (actions != null) {
28252829
for (Action action : actions) {
2826-
visitIconUri(visitor, action.getIcon());
2830+
action.visitUris(visitor);
28272831
}
28282832
}
28292833

@@ -2911,6 +2915,11 @@ public void visitUris(@NonNull Consumer<Uri> visitor) {
29112915
if (mBubbleMetadata != null) {
29122916
visitIconUri(visitor, mBubbleMetadata.getIcon());
29132917
}
2918+
2919+
if (extras != null && extras.containsKey(WearableExtender.EXTRA_WEARABLE_EXTENSIONS)) {
2920+
WearableExtender extender = new WearableExtender(this);
2921+
extender.visitUris(visitor);
2922+
}
29142923
}
29152924

29162925
/**
@@ -11626,6 +11635,12 @@ private void setFlag(int mask, boolean value) {
1162611635
mFlags &= ~mask;
1162711636
}
1162811637
}
11638+
11639+
private void visitUris(@NonNull Consumer<Uri> visitor) {
11640+
for (Action action : mActions) {
11641+
action.visitUris(visitor);
11642+
}
11643+
}
1162911644
}
1163011645

1163111646
/**

‎core/java/android/app/NotificationManager.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,12 @@ public class NotificationManager {
571571
*/
572572
public static final int BUBBLE_PREFERENCE_SELECTED = 2;
573573

574+
/**
575+
* Maximum length of the component name of a registered NotificationListenerService.
576+
* @hide
577+
*/
578+
public static int MAX_SERVICE_COMPONENT_NAME_LENGTH = 500;
579+
574580
@UnsupportedAppUsage
575581
private static INotificationManager sService;
576582

‎packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,9 @@ public String getPackageName() {
243243
return mHelper != null ? mHelper.packageName : null;
244244
}
245245

246-
public void updateState(@NonNull String packageName, int uid, boolean isEnabled) {
246+
/** Updates enabled state based on associated package. */
247+
public void updateState(
248+
@NonNull String packageName, int uid, boolean isEnableAllowed, boolean isEnabled) {
247249
mHelper.updatePackageDetails(packageName, uid);
248250
if (mAppOpsManager == null) {
249251
mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
@@ -254,7 +256,9 @@ public void updateState(@NonNull String packageName, int uid, boolean isEnabled)
254256
final boolean ecmEnabled = getContext().getResources().getBoolean(
255257
com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
256258
final boolean appOpsAllowed = !ecmEnabled || mode == AppOpsManager.MODE_ALLOWED;
257-
if (isEnabled) {
259+
if (!isEnableAllowed && !isEnabled) {
260+
setEnabled(false);
261+
} else if (isEnabled) {
258262
setEnabled(true);
259263
} else if (appOpsAllowed && isDisabledByAppOps()) {
260264
setEnabled(true);

‎packages/SystemUI/src/com/android/systemui/media/controls/resume/MediaResumeListener.kt‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ constructor(
122122
Log.e(TAG, "Error getting package information", e)
123123
}
124124

125-
Log.d(TAG, "Adding resume controls $desc")
125+
Log.d(TAG, "Adding resume controls for ${browser.userId}: $desc")
126126
mediaDataManager.addResumptionControls(
127-
currentUserId,
127+
browser.userId,
128128
desc,
129129
resumeAction,
130130
token,
@@ -196,7 +196,11 @@ constructor(
196196
}
197197
resumeComponents.add(component to lastPlayed)
198198
}
199-
Log.d(TAG, "loaded resume components ${resumeComponents.toArray().contentToString()}")
199+
Log.d(
200+
TAG,
201+
"loaded resume components for $currentUserId: " +
202+
"${resumeComponents.toArray().contentToString()}"
203+
)
200204

201205
if (needsUpdate) {
202206
// Save any missing times that we had to fill in
@@ -210,11 +214,21 @@ constructor(
210214
return
211215
}
212216

217+
val pm = context.packageManager
213218
val now = systemClock.currentTimeMillis()
214219
resumeComponents.forEach {
215220
if (now.minus(it.second) <= RESUME_MEDIA_TIMEOUT) {
216-
val browser = mediaBrowserFactory.create(mediaBrowserCallback, it.first)
217-
browser.findRecentMedia()
221+
// Verify that the service exists for this user
222+
val intent = Intent(MediaBrowserService.SERVICE_INTERFACE)
223+
intent.component = it.first
224+
val inf = pm.resolveServiceAsUser(intent, 0, currentUserId)
225+
if (inf != null) {
226+
val browser =
227+
mediaBrowserFactory.create(mediaBrowserCallback, it.first, currentUserId)
228+
browser.findRecentMedia()
229+
} else {
230+
Log.d(TAG, "User $currentUserId does not have component ${it.first}")
231+
}
218232
}
219233
}
220234
}
@@ -244,7 +258,7 @@ constructor(
244258
Log.d(TAG, "Checking for service component for " + data.packageName)
245259
val pm = context.packageManager
246260
val serviceIntent = Intent(MediaBrowserService.SERVICE_INTERFACE)
247-
val resumeInfo = pm.queryIntentServices(serviceIntent, 0)
261+
val resumeInfo = pm.queryIntentServicesAsUser(serviceIntent, 0, currentUserId)
248262

249263
val inf = resumeInfo?.filter { it.serviceInfo.packageName == data.packageName }
250264
if (inf != null && inf.size > 0) {
@@ -280,13 +294,17 @@ constructor(
280294
browser: ResumeMediaBrowser
281295
) {
282296
// Since this is a test, just save the component for later
283-
Log.d(TAG, "Can get resumable media from $componentName")
297+
Log.d(
298+
TAG,
299+
"Can get resumable media for ${browser.userId} from $componentName"
300+
)
284301
mediaDataManager.setResumeAction(key, getResumeAction(componentName))
285302
updateResumptionList(componentName)
286303
mediaBrowser = null
287304
}
288305
},
289-
componentName
306+
componentName,
307+
currentUserId
290308
)
291309
mediaBrowser?.testConnection()
292310
}
@@ -326,7 +344,7 @@ constructor(
326344
/** Get a runnable which will resume media playback */
327345
private fun getResumeAction(componentName: ComponentName): Runnable {
328346
return Runnable {
329-
mediaBrowser = mediaBrowserFactory.create(null, componentName)
347+
mediaBrowser = mediaBrowserFactory.create(null, componentName, currentUserId)
330348
mediaBrowser?.restart()
331349
}
332350
}

‎packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowser.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.android.systemui.media.controls.resume;
1818

1919
import android.annotation.Nullable;
20+
import android.annotation.UserIdInt;
2021
import android.app.PendingIntent;
2122
import android.content.ComponentName;
2223
import android.content.Context;
@@ -53,6 +54,7 @@ public class ResumeMediaBrowser {
5354
private final ResumeMediaBrowserLogger mLogger;
5455
private final ComponentName mComponentName;
5556
private final MediaController.Callback mMediaControllerCallback = new SessionDestroyCallback();
57+
@UserIdInt private final int mUserId;
5658

5759
private MediaBrowser mMediaBrowser;
5860
@Nullable private MediaController mMediaController;
@@ -62,18 +64,21 @@ public class ResumeMediaBrowser {
6264
* @param context the context
6365
* @param callback used to report media items found
6466
* @param componentName Component name of the MediaBrowserService this browser will connect to
67+
* @param userId ID of the current user
6568
*/
6669
public ResumeMediaBrowser(
6770
Context context,
6871
@Nullable Callback callback,
6972
ComponentName componentName,
7073
MediaBrowserFactory browserFactory,
71-
ResumeMediaBrowserLogger logger) {
74+
ResumeMediaBrowserLogger logger,
75+
@UserIdInt int userId) {
7276
mContext = context;
7377
mCallback = callback;
7478
mComponentName = componentName;
7579
mBrowserFactory = browserFactory;
7680
mLogger = logger;
81+
mUserId = userId;
7782
}
7883

7984
/**
@@ -284,6 +289,14 @@ protected MediaController createMediaController(MediaSession.Token token) {
284289
return new MediaController(mContext, token);
285290
}
286291

292+
/**
293+
* Get the ID of the user associated with this broswer
294+
* @return the user ID
295+
*/
296+
public @UserIdInt int getUserId() {
297+
return mUserId;
298+
}
299+
287300
/**
288301
* Get the media session token
289302
* @return the token, or null if the MediaBrowser is null or disconnected

‎packages/SystemUI/src/com/android/systemui/media/controls/resume/ResumeMediaBrowserFactory.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.android.systemui.media.controls.resume;
1818

19+
import android.annotation.UserIdInt;
1920
import android.content.ComponentName;
2021
import android.content.Context;
2122

@@ -42,10 +43,12 @@ public ResumeMediaBrowserFactory(
4243
*
4344
* @param callback will be called on connection or error, and addTrack when media item found
4445
* @param componentName component to browse
46+
* @param userId ID of the current user
4547
* @return
4648
*/
4749
public ResumeMediaBrowser create(ResumeMediaBrowser.Callback callback,
48-
ComponentName componentName) {
49-
return new ResumeMediaBrowser(mContext, callback, componentName, mBrowserFactory, mLogger);
50+
ComponentName componentName, @UserIdInt int userId) {
51+
return new ResumeMediaBrowser(mContext, callback, componentName, mBrowserFactory, mLogger,
52+
userId);
5053
}
5154
}

0 commit comments

Comments
 (0)