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

Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev

Browse Source 
am: 5b9d876ef5

* commit '5b9d876ef5bf4613d9ef89148c1ab021c473c02e':
  ShortcutManaegr: bug fixes

Change-Id: I3823ba8a62a853d0ee49ec7626778b8fa09adbab
This commit is contained in:
Makoto Onuki
2016-05-04 21:42:26 +00:00
committed by android-build-merger
parent 8fa700675d 5b9d876ef5
commit bdfb3aada3
3 changed files with 67 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/pm/LauncherApps.java
View File

@@ -243,7 +243,9 @@ public class LauncherApps {
}
/**
* If non-null, returns only shortcuts associated with the activity.
* If non-null, returns only shortcuts associated with the activity, which are
* {@link ShortcutInfo}s that have null {@link ShortcutInfo#getActivityComponent()}, or
* {@link ShortcutInfo#getActivityComponent()} equals to {@code activity}.
*/
public void setActivity(@Nullable ComponentName activity) {
mActivity = activity;