Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
237,372 Commits 3 Branches 0 Tags
84f19f00a739d50b4ab139f7548df9a2d3eba372
Commit Graph

7574 Commits

Author SHA1 Message Date
Christopher Tate
41d41c3622 Merge "Add API to clear a specific wallpaper" into nyc-dev am: d493ed6c0c 
am: 06cfa553e3

* commit '06cfa553e3da6f13daa42a045bb1abf8aa89cbfc':
  Add API to clear a specific wallpaper
 2016-03-03 02:29:02 +00:00
Vadim Tryshev
07522d52c2 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev am: c9f0a1103e 
am: dfe2f7ce30

* commit 'dfe2f7ce30dcb40d013da982a975258186195e09':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-03 02:09:25 +00:00
Christopher Tate
06cfa553e3 Merge "Add API to clear a specific wallpaper" into nyc-dev 
am: d493ed6c0c

* commit 'd493ed6c0c37b3d70087ea0512811526e41bb8b8':
  Add API to clear a specific wallpaper
 2016-03-03 01:49:26 +00:00
Vadim Tryshev
dfe2f7ce30 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 
am: c9f0a1103e

* commit 'c9f0a1103ea307e5e157e63e7915b38f83d27ca3':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-03 01:31:18 +00:00
Chris Tate
d493ed6c0c Merge "Add API to clear a specific wallpaper" into nyc-dev 2016-03-03 01:30:35 +00:00
Christopher Tate
79a2457e19 Add API to clear a specific wallpaper 
There was previously no public API for clearing the keyguard wallpaper
versus the system wallpaper, or both.  Now there is.

Bug 27400185

Change-Id: If1789dd430040acdf16d77413c0e4b46bf3789f3
 2016-03-02 17:05:25 -08:00
Vadim Tryshev
c9f0a1103e Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-03 00:28:17 +00:00
Wale Ogunwale
a0c55d2700 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev am: 3716e52be5 
am: feb39e5ba8

* commit 'feb39e5ba8f6866360ff0fcc48317f73ed4aed68':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 23:11:00 +00:00
Wale Ogunwale
feb39e5ba8 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 
am: 3716e52be5

* commit '3716e52be592482534943d32ba0f72309305a224':
  config_supportsMultiWindow for device to specify multi-window support
 2016-03-02 22:55:55 +00:00
Vadim Tryshev
66ae66a7f7 Adding getManagedUserBadgedDrawableForDensity() to PackageManager. 
It allows badging an image regardless of of the user (no
user id parameter). The styling for managed users is applied.

This is useful for new cases where the existing functions
wouldn't badge the icon, but we need it.

Bug: 25192539
Change-Id: I2fd2f226f626fb2e6cda1cfe072013350e12b41c
 2016-03-02 14:55:04 -08:00
Wale Ogunwale
3716e52be5 Merge "config_supportsMultiWindow for device to specify multi-window support" into nyc-dev 2016-03-02 21:55:22 +00:00
Robin Lee
fbf2544cae Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev am: e4872f2a52 
am: 460af2050b

* commit '460af2050ba7ba60d809768cbdbf1772876de3bb':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 21:45:54 +00:00
Robin Lee
460af2050b Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 
am: e4872f2a52

* commit 'e4872f2a52b1929b25e982e7cd050b0f95d73cc1':
  DevicePolicyManager#removeKeyPair- update contract
 2016-03-02 20:27:06 +00:00
Chong Zhang
a65c68cb3d Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev am: 5d9de3ab6f 
am: 20862420c2

* commit '20862420c23bab9a83d79ac5c81745e7aae24536':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 20:25:35 +00:00
Robin Lee
e4872f2a52 Merge "DevicePolicyManager#removeKeyPair- update contract" into nyc-dev 2016-03-02 20:05:41 +00:00
Robin Lee
8f617d40ab DevicePolicyManager#removeKeyPair- update contract 
May also return true if the keypair didn't exist in the first place
which is a small reduction in the amount of information leakage, but
more importantly lets a caller be sure about keystore state at the end
of their call.

Bug: 27335182
Change-Id: I5e6d4c599b74f031e3f6d17cb7540898ffaf2571
 2016-03-02 19:54:04 +00:00
Chong Zhang
20862420c2 Merge "Don\'t change resize mode if AM didn\'t dock the task as requested" into nyc-dev 
am: 5d9de3ab6f

* commit '5d9de3ab6f768c9b9d5c4fa627ce019f74370531':
  Don't change resize mode if AM didn't dock the task as requested
 2016-03-02 18:42:42 +00:00
Chong Zhang
5d9de3ab6f Merge "Don't change resize mode if AM didn't dock the task as requested" into nyc-dev 2016-03-02 18:30:00 +00:00
Keun-young Park
19f517777b Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev am: 98e386f650 
am: b023406ab4

* commit 'b023406ab466224f6f8c8fc2c0f2c3717435a18d':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:36:13 +00:00
Keun-young Park
b023406ab4 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 
am: 98e386f650

* commit '98e386f650d5f6d05792d164e78ff3cbdbc5381e':
  Revert "Revert "make isUiModeLocked, isNightModeLocked test api""
 2016-03-02 17:22:53 +00:00
Keun-young Park
98e386f650 Merge "Revert "Revert "make isUiModeLocked, isNightModeLocked test api""" into nyc-dev 2016-03-02 17:12:42 +00:00
Calin Juravle
1389e993aa Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev am: 3977f20d00 
am: 355a74150d

* commit '355a74150d3be8a86a7cea3d64d9be1aab442225':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:44:54 +00:00
Calin Juravle
355a74150d Merge "Simplify the error logs for profiles we can\'t open." into nyc-dev 
am: 3977f20d00

* commit '3977f20d002c803f211599b44f457ff7dc3e7dd6':
  Simplify the error logs for profiles we can't open.
 2016-03-02 16:32:00 +00:00
Wale Ogunwale
fb1c86439c config_supportsMultiWindow for device to specify multi-window support 
Devices that have the config set to false will not allow any multi-window
operation.

Also, added ActivityManager.supportsMultiWindow that checks the new config
and also returns false if the device is a low RAM device.

Bug: 27419483
Change-Id: I8dd85c17d290a5a752de3253beb3b34c17d7736d
 2016-03-02 08:28:08 -08:00
Calin Juravle
3977f20d00 Merge "Simplify the error logs for profiles we can't open." into nyc-dev 2016-03-02 16:17:34 +00:00
Jeff Sharkey
e6ee9112d5 Merge "When system server goes down, crash admins." into nyc-dev am: 5ca0b3462d 
am: 49b57831fa

* commit '49b57831fa7baa3d83a6c149bed1b4abfafa3d4b':
  When system server goes down, crash admins.
 2016-03-02 07:00:38 +00:00
Jeff Sharkey
d1be3e0bdf Merge "When system server goes down, crash apps more." into nyc-dev am: 60b7bcc614 
am: 33a64f5e56

* commit '33a64f5e5600d86ef6ce270ce57fffbf4f2ab35d':
  When system server goes down, crash apps more.
 2016-03-02 06:57:26 +00:00
Vadim Tryshev
79a1dd6e30 Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev am: 791d078d0b 
am: 744ed05715

* commit '744ed057157babc91696de2a983126c1cae631fb':
  Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
 2016-03-02 06:48:53 +00:00
Jeff Sharkey
63bf7d23ac Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev am: 19c7699309 
am: e37ee97871

* commit 'e37ee97871f8be16a9bea704c1d81f0631532066':
  Don't evict SharedPreferences when migrate no-op.
 2016-03-02 06:39:56 +00:00
Vadim Tryshev
3c597665e7 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev am: 6b1eb711d4 
am: b23ebe99a8

* commit 'b23ebe99a80c4328cbccf1dda39419e362ed5ffa':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-02 06:32:47 +00:00
Filip Gruszczynski
1e32c6181d Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev am: 75f5de62fe 
am: 641da7834e

* commit '641da7834e01bd7d124826fbaac095a31b1a155d':
  Relaunch activity resumed if it got resumed before relaunching.
 2016-03-02 06:29:21 +00:00
Lorenzo Colitti
b6ee6967fe Merge "Don\'t pass calling contexts into static services." into nyc-dev am: 7f2b6e2a84 
am: 752837ac79

* commit '752837ac79f5fd1179fd9daa3ede1374c1afdae4':
  Don't pass calling contexts into static services.
 2016-03-02 06:18:12 +00:00
Keun-young Park
93f0d5d29c Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev am: 8486706aff 
am: 765415a766

* commit '765415a76624ce2e041ef814039bdb1693e3d2b8':
  Revert "make isUiModeLocked, isNightModeLocked test api"
 2016-03-02 05:55:09 +00:00
George Mount
35b8f81d50 Merge "Clear child fragment manager after it is destroyed." into nyc-dev am: f445f76eca 
am: af3b3b6213

* commit 'af3b3b621391c44d4330ca99947655322573effa':
  Clear child fragment manager after it is destroyed.
 2016-03-02 05:44:30 +00:00
George Mount
426bfb1e18 Merge "Ensure that fragments are created in added order." into nyc-dev am: b67d34f10e 
am: 3bbd384a6c

* commit '3bbd384a6cf70a34101eee3b8e64c7906fee1420':
  Ensure that fragments are created in added order.
 2016-03-02 05:42:05 +00:00
Todd Kennedy
1d67f35132 Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev am: 4f858aaa5a 
am: d509acbf45

* commit 'd509acbf45a5f9af931c50dc0e69cc99c876e648':
  Revert "Revert "Remove deprecated methods / classes""
 2016-03-02 05:03:03 +00:00
Wale Ogunwale
60bf254e6d Merge "Add activity onStop lifecycle to event logs." into nyc-dev am: 6e66695777 
am: 54a45c2e1b

* commit '54a45c2e1b287e4714ffe8d007a8ae2c8394a17a':
  Add activity onStop lifecycle to event logs.
 2016-03-02 04:57:37 +00:00
Jeff Sharkey
49b57831fa Merge "When system server goes down, crash admins." into nyc-dev 
am: 5ca0b3462d

* commit '5ca0b3462d84c2d15f1e9947d073b28b3cd6e189':
  When system server goes down, crash admins.
 2016-03-02 03:21:17 +00:00
Jeff Sharkey
5ca0b3462d Merge "When system server goes down, crash admins." into nyc-dev 2016-03-02 03:17:45 +00:00
Jeff Sharkey
dbff9ca4a5 When system server goes down, crash admins. 
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: I866a8c3c9682da1de2a31fe8b4ffcc9d7f4d8ba0
 2016-03-01 20:15:40 -07:00
Jeff Sharkey
33a64f5e56 Merge "When system server goes down, crash apps more." into nyc-dev 
am: 60b7bcc614

* commit '60b7bcc614ae818c902e1a0ed3b2381e23eba61c':
  When system server goes down, crash apps more.
 2016-03-02 02:51:39 +00:00
Jeff Sharkey
60b7bcc614 Merge "When system server goes down, crash apps more." into nyc-dev 2016-03-02 02:42:16 +00:00
Vadim Tryshev
744ed05715 Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev 
am: 791d078d0b

* commit '791d078d0bdcd5f10f4aa928afc4dda8086e4129':
  Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."
 2016-03-02 02:35:03 +00:00
Jeff Sharkey
c53962d4ed When system server goes down, crash apps more. 
Apps making calls into the system server may end up persisting
internal state or making security decisions based on the perceived
success or failure of a call, or the default values returned.

The reality is that if the system process just died, init will be
along shortly to kill all running apps, so we should have no problem
rethrowing the RemoteException as a RuntimeException.

Bug: 27364859
Change-Id: Ife0bcb079636c88d54c44d17eb580409fd79028b
 2016-03-01 19:29:16 -07:00
Keun-young Park
078f9b9813 Revert "Revert "make isUiModeLocked, isNightModeLocked test api"" 
This reverts commit 92373d23ee.

Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f
 2016-03-02 02:18:19 +00:00
Jeff Sharkey
e37ee97871 Merge "Don\'t evict SharedPreferences when migrate no-op." into nyc-dev 
am: 19c7699309

* commit '19c7699309f7aa6ce487a8db353ea24acf94c4ca':
  Don't evict SharedPreferences when migrate no-op.
 2016-03-02 02:02:05 +00:00
Vadim Tryshev
b23ebe99a8 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 
am: 6b1eb711d4

* commit '6b1eb711d443242e41f8f81580fcfe336a131aa2':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
 2016-03-02 01:56:00 +00:00
Filip Gruszczynski
641da7834e Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev 
am: 75f5de62fe

* commit '75f5de62fe4f7b529e51c6f3181483ed574cbd58':
  Relaunch activity resumed if it got resumed before relaunching.
 2016-03-02 01:52:53 +00:00
Vadim Tryshev
791d078d0b Merge "Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager."" into nyc-dev 2016-03-02 01:52:19 +00:00
Vadim Tryshev
093622f089 Revert "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." 
This reverts commit 9f68f41a58.

Caused breakage.

Change-Id: I441737f61f6f38ed9f440211b52bbac0f74982e3
 2016-03-02 01:51:42 +00:00