Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
236,997 Commits 3 Branches 0 Tags
fb7e6ad69a1e7f99f00a420901850175f488d3a4
Commit Graph

7534 Commits

Author SHA1 Message Date
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
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
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
68b7c1c87f Merge "Suppress StopInfo exception based on target API." into nyc-dev am: d1caf8560d 
am: cfc7bc8137

* commit 'cfc7bc8137ad512e032a9e72be312f7d807efe6b':
  Suppress StopInfo exception based on target API.
 2016-03-02 01:40:39 +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
Winson
02a9c0335f Merge "Disable extracting the bg color from the window background." into nyc-dev am: 1f3eca97b9 
am: 8da4971577

* commit '8da4971577a9180b603670a1970d4916902a9147':
  Disable extracting the bg color from the window background.
 2016-03-01 20:34:34 +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
705e467a77 Merge "make isUiModeLocked, isNightModeLocked test api" into nyc-dev am: 63f2c9b0cb 
am: 614955d3f9

* commit '614955d3f94c14d4761d64b9bcb15fb99e67a8ee':
  make isUiModeLocked, isNightModeLocked test api
 2016-03-01 19:59:03 +00:00
Calin Juravle
75a54f3e04 Merge "Restrict the cases when we profile guided compile an apk" into nyc-dev am: e1ac71fe99 
am: 48175a5959

* commit '48175a59590a7e3f49bc3dabeea6602c5aa9b230':
  Restrict the cases when we profile guided compile an apk
 2016-03-01 19:52:14 +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
9eb7ca8e9d Merge "Display Toast with linker warnings after Activity.onStart()" into nyc-dev am: 1984d78330 
am: 2b594cdcc7

* commit '2b594cdcc7cd6881c41f1fd39122b182d9ee0e8b':
  Display Toast with linker warnings after Activity.onStart()
 2016-03-01 19:35:52 +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
bf7a8688fa Merge "Correct state loss tracking for FragmentTransaction.commitNow" into nyc-dev am: 55fc649368 
am: 3eb3620603

* commit '3eb362060313307f9f1d0961ac9d09c525e58aec':
  Correct state loss tracking for FragmentTransaction.commitNow
 2016-03-01 19:26:16 +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
67536e7b44 Merge "Adding SecurityException information to all device logging DPM public methods" into nyc-dev am: 8fc5462ee1 
am: 5bbc8cd539

* commit '5bbc8cd539ca81bfa37929f3a5b0ec11a7d4a510':
  Adding SecurityException information to all device logging DPM public methods
 2016-03-01 16:08:26 +00:00