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

56244 Commits

Author SHA1 Message Date
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
Eino-Ville Talvala
72071de87c Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 
am: 74989b4d3f

* commit '74989b4d3ffdcd3def599e1f973d481062ba8e6f':
  Camera2: Switch to auto-gen C++ binder interfaces
 2016-03-02 22:50:14 +00: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
Eino-Ville Talvala
74989b4d3f Merge "Camera2: Switch to auto-gen C++ binder interfaces" into nyc-dev 2016-03-02 21:47:13 +00:00
Ido Ofir
379db962ef Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 
am: 51e06e011d

* commit '51e06e011d3694d410718dafe15341f8bd9cd392':
  checking additional metadata and completed categories before displaying suggested actions in settings.
 2016-03-02 21:43:58 +00:00
Ido Ofir
51e06e011d Merge "checking additional metadata and completed categories before displaying suggested actions in settings." into nyc-dev 2016-03-02 21:30:36 +00:00
Chong Zhang
d1f8eb3f7b Merge "Force disconnect when the surface is about to be saved." into nyc-dev 
am: f8fd852060

* commit 'f8fd8520606ff579f966a0f76864c7e5ee1b35ef':
  Force disconnect when the surface is about to be saved.
 2016-03-02 20:30:52 +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
f8fd852060 Merge "Force disconnect when the surface is about to be saved." into nyc-dev 2016-03-02 20:10:10 +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
Ido Ofir
d193c6729f checking additional metadata and completed categories before displaying 
suggested actions in settings.

Bug: 27271616
Change-Id: I855bc03337b04c5ff685c102f44dfc0d6638592b
 2016-03-02 09:58:59 -08: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
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
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
Lorenzo Colitti
6ad667122c Merge changes Ic366b532,I0179b45b into nyc-dev 
am: b7ffb76437

* commit 'b7ffb764370805aa0734d2f31bc2def34df04d86':
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
 2016-03-02 04:19:15 +00:00
Lorenzo Colitti
b7ffb76437 Merge changes Ic366b532,I0179b45b into nyc-dev 
* changes:
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.
 2016-03-02 04:18:03 +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
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
Eino-Ville Talvala
5d2d7788f1 Camera2: Switch to auto-gen C++ binder interfaces 
- Move camera AIDL files to frameworks/av
 - Update makefiles to point to new AIDL locations
 - Adjust camera2 implementation to match modifications to AIDL needed
   for native AIDL auto-generation
 - Move Surface.aidl to frameworks/native to allow use in
   native AIDL. Use android::view::Surface in Surface JNI to
   serialize Surface objects to ensure parceling compatibility.
 - Adjust service binder tests to new interface

Bug: 25091611
Change-Id: I85b817374b34a4540fa145328dbe4bbf7f746baf
 2016-03-01 17:15:17 -08: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