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

61952 Commits

Author SHA1 Message Date
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
Steve McKay
24dd9ad0c0 Merge "Always show intern storage." into nyc-dev am: b4672ef6df 
am: 1788dfd223

* commit '1788dfd223c7c62005b8c1e98cd25737f685a912':
  Always show intern storage.
 2016-03-02 20:32:39 +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
Steve McKay
1788dfd223 Merge "Always show intern storage." into nyc-dev 
am: b4672ef6df

* commit 'b4672ef6dfbaf416981539d515ad1489d7d0bc87':
  Always show intern storage.
 2016-03-02 19:02:19 +00:00
Steve McKay
b4672ef6df Merge "Always show intern storage." into nyc-dev 2016-03-02 18:49:28 +00:00
Steve McKay
7c4395804e Always show intern storage. 
Only show debug root when devel mode is enabled.
Remove all traces of "advanced".

Bug: 27297398

Change-Id: Ie7e8be282531bd245351d56ababa8ca625c10fd2
 2016-03-02 10:47:59 -08: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
Greg Kaiser
62ff8f83f7 Merge "SensorEventListener: Clarify documentation." into nyc-dev am: 7d3a9e5259 
am: 09c7c0ed3e

* commit '09c7c0ed3ecbc181e0de1fb2a6d91eabd9761520':
  SensorEventListener: Clarify documentation.
 2016-03-02 18:15:21 +00:00
Greg Kaiser
db151c1987 Merge "doc: Fix syntax error in code example." into nyc-dev am: fa806c5031 
am: 789071d5cc

* commit '789071d5ccf6d4a45142e6d23485b11a767c4d65':
  doc: Fix syntax error in code example.
 2016-03-02 18:13:35 +00:00
Greg Kaiser
09c7c0ed3e Merge "SensorEventListener: Clarify documentation." into nyc-dev 
am: 7d3a9e5259

* commit '7d3a9e525943705c7a6dca11929cfba29b2a24c1':
  SensorEventListener: Clarify documentation.
 2016-03-02 17:50:18 +00:00
Greg Kaiser
789071d5cc Merge "doc: Fix syntax error in code example." into nyc-dev 
am: fa806c5031

* commit 'fa806c5031028353c7b16c20a4f5c77246221112':
  doc: Fix syntax error in code example.
 2016-03-02 17:47:58 +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
Greg Kaiser
7d3a9e5259 Merge "SensorEventListener: Clarify documentation." into nyc-dev 2016-03-02 17:27:47 +00:00
Greg Kaiser
fa806c5031 Merge "doc: Fix syntax error in code example." into nyc-dev 2016-03-02 17:26:45 +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
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
Nimrod Gileadi
727b62a028 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev am: c14893bf5a 
am: a2f24a01f1

* commit 'a2f24a01f1d47888abde620cce003c9e11bd49f4':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:45:09 +00:00
Nimrod Gileadi
a2f24a01f1 Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 
am: c14893bf5a

* commit 'c14893bf5a2ad76ad6279f09b66020610e32041f':
  Close InputStream in BatteryStatsHelper
 2016-03-02 09:24:38 +00:00
Nimrod Gileadi
c14893bf5a Merge "Close InputStream in BatteryStatsHelper" into nyc-dev 2016-03-02 09:17:21 +00:00
Lorenzo Colitti
e22fc07fa9 Merge changes Id78aab9c,I51096b18 into nyc-dev am: 1856df512f 
am: 057f24547a

* commit '057f24547afe0e2122863cab96b8149a43d3cf2d':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:59:08 +00:00
Lorenzo Colitti
057f24547a Merge changes Id78aab9c,I51096b18 into nyc-dev 
am: 1856df512f

* commit '1856df512fc3d69096505491512fa26fb8ffdc09':
  Speed up ConnectivityServiceTest.
  Make it easier to test code that uses WakeupMessage.
 2016-03-02 08:38:59 +00:00
Lorenzo Colitti
cdbf981889 Merge changes Ic366b532,I0179b45b into nyc-dev am: b7ffb76437 
am: 6ad667122c

* commit '6ad667122c35098ab62afd92b5ac26937397825b':
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
 2016-03-02 07:04:56 +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
Jeff Sharkey
2a849f0de2 Merge "Utility to detect lock inversions in system." into nyc-dev am: 8e28443aa7 
am: 0b37afa7b0

* commit '0b37afa7b0266b2adc7b7100fe3165ecf82dc29c':
  Utility to detect lock inversions in system.
 2016-03-02 06:35:04 +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
Jeff Sharkey
308b9b3739 Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev am: 85f2ded23e 
am: d6a632bd2e

* commit 'd6a632bd2e1a06ad4b91388f66e440a829d5791e':
  Sometimes to step forward, we need to go back. [2/2]
 2016-03-02 06:26:58 +00:00
Jeff Sharkey
4ac7f0391e Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev am: 888de830ed 
am: 24f4adb70f

* commit '24f4adb70fb16a0d9e7a6ec784623c53881586cd':
  Sometimes to step forward, we need to go back. [1/2]
 2016-03-02 06:23:59 +00:00
Yigit Boyar
786f71ef01 Merge "Check if item is selectable before calling on click" into nyc-dev am: 5ae74b7fa6 
am: 82036dbe65

* commit '82036dbe6569c807500836d624e1187ed0bb2449':
  Check if item is selectable before calling on click
 2016-03-02 06:20:29 +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
Svetoslav Ganov
0a21d65d04 Merge "API for safe label to present in the UI" into nyc-dev am: 6cc1ba8e17 
am: d36d11f232

* commit 'd36d11f2323dbb28c3885b4a49ebc5b73712b35d':
  API for safe label to present in the UI
 2016-03-02 06:08:51 +00:00
Anna Galusza
acf9b1394f 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 
am: e853ceb080

* commit 'e853ceb080df09bb22a3f8c28441a0d61068b0ce':
  Throw exception from SoftKeyboardController if connection is dead and declare SHOW_MODE_AUTO and SHOW_MODE_HIDDEN in AccessibilityService class. Bug: 27364143
 2016-03-02 06:06:18 +00:00
Fyodor Kupolov
3fa9f47147 Merge "Disable switching users if the user is in a call" into nyc-dev am: 285bec2641 
am: cef5ba5adc

* commit 'cef5ba5adc070e31fb1a568bd8c48b5d631f1cf4':
  Disable switching users if the user is in a call
 2016-03-02 06:03:15 +00:00
Alan Viverette
26daa2c7f6 Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev am: 90ed1eca3e 
am: 80e6a6a696

* commit '80e6a6a6964c64073fc51b5b5655092132cdaaeb':
  Use Holo date/time picker layouts on very small screens
 2016-03-02 06:00:43 +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
Lorenzo Colitti
e7636e4750 Make it easier to test code that uses WakeupMessage. 
Code that uses WakeupMessage uses the AlarmManager. Testing such
code is slow because AlarmManager.MIN_FUTURITY ensures that
alarms must wait at least 5 seconds before firing.

This change makes WakeupMessage's fields protected so that test
code can subclass from it and override schedule() and cancel()
with implementations that do not use AlarmManager, for example
by making schedule() call sendEmptyMessageDelayed and making
cancel() call removeMessages.

Change-Id: I51096b182d9eb87cc7bd46c3c91906f18356b354
 2016-03-02 14:15:04 +09: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