Commit Graph

61597 Commits

Author SHA1 Message Date
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
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
Jeff Sharkey
0b37afa7b0 Merge "Utility to detect lock inversions in system." into nyc-dev
am: 8e28443aa7

* commit '8e28443aa7263d4d7a78f39fab32176505e3506d':
  Utility to detect lock inversions in system.
2016-03-02 01:57:52 +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
Jeff Sharkey
d6a632bd2e Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev
am: 85f2ded23e

* commit '85f2ded23e0e77678f606dfa3ea4536d71c6edd2':
  Sometimes to step forward, we need to go back. [2/2]
2016-03-02 01:50:25 +00:00
Jeff Sharkey
24f4adb70f Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev
am: 888de830ed

* commit '888de830edd037118e9f3a864e5930f2c7defa3c':
  Sometimes to step forward, we need to go back. [1/2]
2016-03-02 01:48:30 +00:00
Yigit Boyar
82036dbe65 Merge "Check if item is selectable before calling on click" into nyc-dev
am: 5ae74b7fa6

* commit '5ae74b7fa6f962d2732c32b3cd4c180ae58fd866':
  Check if item is selectable before calling on click
2016-03-02 01:44:50 +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
Jeff Sharkey
8e28443aa7 Merge "Utility to detect lock inversions in system." into nyc-dev 2016-03-02 00:52:21 +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
Jeff Sharkey
85f2ded23e Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev 2016-03-02 00:38:41 +00:00
Jeff Sharkey
888de830ed Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev 2016-03-02 00:38:33 +00:00
Yigit Boyar
5ae74b7fa6 Merge "Check if item is selectable before calling on click" into nyc-dev 2016-03-02 00:36:50 +00:00
Jeff Sharkey
fa6a1bc755 Sometimes to step forward, we need to go back. [2/2]
Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f
2016-03-01 17:36:23 -07:00
Lorenzo Colitti
7f2b6e2a84 Merge "Don't pass calling contexts into static services." into nyc-dev 2016-03-02 00:33:42 +00:00
Jeff Sharkey
9ad443f59c Sometimes to step forward, we need to go back. [1/2]
Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a
2016-03-01 17:28:36 -07:00
Yigit Boyar
418d0cf5c9 Check if item is selectable before calling on click
This CL fixes a bug in ListView where it might call onClick on an
un-clickable if a new touch arrives before up timeout.

We could actually consider making child position non-changable
but that will change behavior. This seems safer approach.

Bug: 27198796
Change-Id: I7b15d04efa19d1d760a294bd027f3da3aaa3a445
2016-03-01 16:09:58 -08:00
Svetoslav Ganov
d36d11f232 Merge "API for safe label to present in the UI" into nyc-dev
am: 6cc1ba8e17

* commit '6cc1ba8e174935aeaf5e6da20cb8aeb243c2f08c':
  API for safe label to present in the UI
2016-03-01 23:59:13 +00:00
Anna Galusza
e853ceb080 Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev
am: 2e36a9e1c7

* commit '2e36a9e1c726310c51005b1b970ac9394006bdbd':
  Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143
2016-03-01 23:57:15 +00:00
Svetoslav Ganov
6cc1ba8e17 Merge "API for safe label to present in the UI" into nyc-dev 2016-03-01 23:42:20 +00:00
Anna Galusza
2e36a9e1c7 Merge "Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143" into nyc-dev 2016-03-01 23:39:09 +00:00
Fyodor Kupolov
cef5ba5adc Merge "Disable switching users if the user is in a call" into nyc-dev
am: 285bec2641

* commit '285bec2641292abc37c5ad230bd309cede754a70':
  Disable switching users if the user is in a call
2016-03-01 23:33:32 +00:00
Alan Viverette
80e6a6a696 Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev
am: 90ed1eca3e

* commit '90ed1eca3e959a9534c9c8d3cfcf92dd3983e6c6':
  Use Holo date/time picker layouts on very small screens
2016-03-01 23:31:53 +00:00
Fyodor Kupolov
285bec2641 Merge "Disable switching users if the user is in a call" into nyc-dev 2016-03-01 23:21:29 +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
Alan Viverette
90ed1eca3e Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev 2016-03-01 23:13:43 +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
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
Svetoslav Ganov
aa8b0d74f4 API for safe label to present in the UI
bug:23531798

Change-Id: Ic3e0ed3db11445dbc5e562ca1a91b181ec5f2553
2016-03-01 14:31:39 -08:00
Jakub Pawlowski
9a622515b7 Merge "Hide android.bluetooth.OobData" into nyc-dev
am: ecc873d5ee

* commit 'ecc873d5ee8730833fe261e03b8b058c343d71db':
  Hide android.bluetooth.OobData
2016-03-01 22:30:25 +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
Alan Viverette
6b3f85f87e Use Holo date/time picker layouts on very small screens
If the screen is smaller than "small" then use the Holo picker layouts.
Unifies the SavedState between delegates so that we can seamlessly
transition between them during configuration changes. Pushes the
DatePickerSpinnerDelegate up to the same level as the calendar delegate.

Bug: 27239893
Change-Id: Ida4dc2748d38bd766ae93d12aef15e963921939c
2016-03-01 16:48:04 -05: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
Anna Galusza
3204251a4a Throw exception from SoftKeyboardController if connection is dead and declare
SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class.
Bug: 27364143

Change-Id: I02c23fbfab1eae8b2a155b1d9c3857e4eb6addb1
2016-03-01 12:40:19 -08:00
Todd Kennedy
4f858aaa5a Merge "Revert "Revert "Remove deprecated methods / classes""" into nyc-dev 2016-03-01 20:39:59 +00:00