Commit Graph

7451 Commits

Author SHA1 Message Date
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
Vadim Tryshev
c9f0a1103e Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-03 00:28:17 +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
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
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
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
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
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
Lorenzo Colitti
752837ac79 Merge "Don\'t pass calling contexts into static services." into nyc-dev
am: 7f2b6e2a84

* commit '7f2b6e2a8492d2b751f1695a747aef5f53d30d8c':
  Don't pass calling contexts into static services.
2016-03-02 01:42:55 +00:00
Jeff Sharkey
19c7699309 Merge "Don't evict SharedPreferences when migrate no-op." into nyc-dev 2016-03-02 00:53:13 +00:00
Vadim Tryshev
6b1eb711d4 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-02 00:49:32 +00:00
Wale Ogunwale
75f5de62fe Merge "Relaunch activity resumed if it got resumed before relaunching." into nyc-dev 2016-03-02 00:45:04 +00:00
Vadim Tryshev
9f68f41a58 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: I20ca2d7265cbc3a47c050a72ec1843cc0a481c74
2016-03-02 00:41:26 +00:00
Lorenzo Colitti
7f2b6e2a84 Merge "Don't pass calling contexts into static services." into nyc-dev 2016-03-02 00:33:42 +00:00
Keun-young Park
765415a766 Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev
am: 8486706aff

* commit '8486706affc6366af57a4e39797f9bf8d2ad68e3':
  Revert "make isUiModeLocked, isNightModeLocked test api"
2016-03-01 23:16:13 +00:00
Keun-young Park
8486706aff Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev 2016-03-01 22:59:14 +00:00
Keun-young Park
92373d23ee Revert "make isUiModeLocked, isNightModeLocked test api"
This reverts commit b493a7dffe.

Change-Id: I651b7ee5b9ca5d7fa1cde1c625bbaa585e186544
2016-03-01 22:58:15 +00:00
George Mount
af3b3b6213 Merge "Clear child fragment manager after it is destroyed." into nyc-dev
am: f445f76eca

* commit 'f445f76ecafd9734e7f2ff9d5e42c3d77fdcfffd':
  Clear child fragment manager after it is destroyed.
2016-03-01 22:53:25 +00:00
Chong Zhang
e4fbd328f8 Don't change resize mode if AM didn't dock the task as requested
AM may not docked the task as requested if the task is not resizeable.
Setting resizing in this case would cause unnecessary drag-resizing,
and the resize mode will go out of sync.

bug: 27390258
Change-Id: I72d671ac015f93fde5aaa025fbade93acd9d9ca7
2016-03-01 14:52:58 -08:00
George Mount
3bbd384a6c Merge "Ensure that fragments are created in added order." into nyc-dev
am: b67d34f10e

* commit 'b67d34f10e8accd1c205e4db0679fdd32df28a6a':
  Ensure that fragments are created in added order.
2016-03-01 22:51:31 +00:00
Todd Kennedy
d509acbf45 Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev
am: 4f858aaa5a

* commit '4f858aaa5a7ef493e79e6d35a8d526f5d8de97e9':
  Revert "Revert "Remove deprecated methods / classes""
2016-03-01 22:41:14 +00:00
Wale Ogunwale
54a45c2e1b Merge "Add activity onStop lifecycle to event logs." into nyc-dev
am: 6e66695777

* commit '6e6669577780cb343703f19e15df40bcae905437':
  Add activity onStop lifecycle to event logs.
2016-03-01 22:37:44 +00:00
Jeff Sharkey
390f2ed66b Don't evict SharedPreferences when migrate no-op.
When calling migrateSharedPreferencesFrom(), only evict the in-memory
caches when we actually moved files around.

Bug: 27387346
Change-Id: I4fb534e55c0d3df7c574f18d2a853ef824635b8e
2016-03-01 15:25:06 -07:00
Jeff Sharkey
cfc7bc8137 Merge "Suppress StopInfo exception based on target API." into nyc-dev
am: d1caf8560d

* commit 'd1caf8560df4860fa7fcbd63afe359990f72d9f4':
  Suppress StopInfo exception based on target API.
2016-03-01 22:20:58 +00:00
George Mount
f445f76eca Merge "Clear child fragment manager after it is destroyed." into nyc-dev 2016-03-01 21:41:45 +00:00
George Mount
b67d34f10e Merge "Ensure that fragments are created in added order." into nyc-dev 2016-03-01 21:40:54 +00:00
Todd Kennedy
4f858aaa5a Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev 2016-03-01 20:39:59 +00:00
Wale Ogunwale
6e66695777 Merge "Add activity onStop lifecycle to event logs." into nyc-dev 2016-03-01 20:34:15 +00:00
Winson
8da4971577 Merge "Disable extracting the bg color from the window background." into nyc-dev
am: 1f3eca97b9

* commit '1f3eca97b9a929f2fae33cea930b84ddd2c5d602':
  Disable extracting the bg color from the window background.
2016-03-01 20:19:08 +00:00
Keun-young Park
614955d3f9 Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev
am: 63f2c9b0cb

* commit '63f2c9b0cb2d041202978369ccb9ed3726cd8e3b':
  make isUiModeLocked, isNightModeLocked test api
2016-03-01 19:45:16 +00:00