Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
235,639 Commits 3 Branches 0 Tags
151df69f5fe0fde05fd66eb054cada24187ca694
Commit Graph

7433 Commits

Author SHA1 Message Date
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
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
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
Calin Juravle
48175a5959 Merge "Restrict the cases when we profile guided compile an apk" into nyc-dev 
am: e1ac71fe99

* commit 'e1ac71fe9924add9368d118932e6c2bf0dfb2d70':
  Restrict the cases when we profile guided compile an apk
 2016-03-01 19:38:31 +00:00
Dimitry Ivanov
2b594cdcc7 Merge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev 
am: 1984d78330

* commit '1984d783304fe1ee915907d3a3c631f73d1243ff':
  Display Toast with linker warnings after Activity.onStart()
 2016-03-01 19:29:23 +00:00
Adam Powell
3eb3620603 Merge "Correct state loss tracking for FragmentTransaction.commitNow" into nyc-dev 
am: 55fc649368

* commit '55fc649368b09347d5af14cd26b2ef87d577451a':
  Correct state loss tracking for FragmentTransaction.commitNow
 2016-03-01 19:24:22 +00:00
Jeff Sharkey
9ad8613bbb Suppress StopInfo exception based on target API. 
Bug: 27429026
Change-Id: Ibf0b058b1f921c20fbc3c72045467883a8934f67
 2016-03-01 12:18:40 -07:00
Winson Chung
1f3eca97b9 Merge "Disable extracting the bg color from the window background." into nyc-dev 2016-03-01 19:07:36 +00:00
Keun-young Park
63f2c9b0cb Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev 2016-03-01 18:37:57 +00:00
Calin Juravle
e1ac71fe99 Merge "Restrict the cases when we profile guided compile an apk" into nyc-dev 2016-03-01 17:59:20 +00:00
Dimitry Ivanov
1984d78330 Merge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev 2016-03-01 17:50:02 +00:00
Filip Gruszczynski
c3b6179fca Relaunch activity resumed if it got resumed before relaunching. 
This fixes following scenario:
1) first activity starts second activity and expects results; first
activity gets paused;
2) second activity finishes and returns a result;
3) first activity is still paused and receives the result from the second
activity; first activty requests a local relaunch; relaunch gets
scheduled and is marked as launching paused (because the activity is
still paused)
4) first activity resumes;
5) first activity relaunches and finishes in paused state.

The fix makes it drop the information about launching paused if it is
local when it gets resumed in step 4.

Bug: 25674611
Bug: 26116905
Change-Id: Ieeef3f0d5c311679882fdc59c13fd8a99e3d3a20
 2016-03-01 09:29:14 -08:00
Adam Powell
3518feda21 Correct state loss tracking for FragmentTransaction.commitNow 
Booleans are hard.

Bug 27419920

Change-Id: I91a746aa14cad36bf77ec6224ffc13b00dc39ae7
 2016-03-01 09:07:44 -08:00
Michal Karpinski
5bbc8cd539 Merge "Adding SecurityException information to all device logging DPM public methods" into nyc-dev 
am: 8fc5462ee1

* commit '8fc5462ee1f9b8e5b13d13b0920433b340fa6b6c':
  Adding SecurityException information to all device logging DPM public methods
 2016-03-01 16:04:35 +00:00
Michal Karpinski
8fc5462ee1 Merge "Adding SecurityException information to all device logging DPM public methods" into nyc-dev 2016-03-01 15:57:44 +00:00
Wale Ogunwale
cd7043e99a Add activity onStop lifecycle to event logs. 
Also added reasons why onPause and onResume are called.

Bug: 27384433
Change-Id: If6c304f577b601511f6d9b948061d2cfa0dcb970
 2016-03-01 07:29:17 -08:00
Michal Karpinski
b58e4966db Adding SecurityException information to all device logging DPM public methods 
Bug: 22860162
Change-Id: I6cdfad2dcdf14896c855debef34964def190e110
 2016-03-01 15:26:56 +00:00
Todd Kennedy
a67932374d Revert "Revert "Remove deprecated methods / classes"" 
This reverts commit 5cbeb59026.

Change-Id: Id96010364d65e6131221ebbcc8ce5889a2da256c
 2016-03-01 07:19:33 -08:00
Julia Reynolds
84c0cf5baf Merge "Api review: AutomaticZenRule" into nyc-dev 
am: 2319dd3a66

* commit '2319dd3a66754b8b6ff27a1363c33244a8a9eccc':
  Api review: AutomaticZenRule
 2016-03-01 15:07:23 +00:00
Julia Reynolds
2319dd3a66 Merge "Api review: AutomaticZenRule" into nyc-dev 2016-03-01 15:05:36 +00:00