Commit Graph

61654 Commits

Author SHA1 Message Date
Christopher Tate
06cfa553e3 Merge "Add API to clear a specific wallpaper" into nyc-dev
am: d493ed6c0c

* commit 'd493ed6c0c37b3d70087ea0512811526e41bb8b8':
  Add API to clear a specific wallpaper
2016-03-03 01:49:26 +00:00
Vadim Tryshev
dfe2f7ce30 Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev
am: c9f0a1103e

* commit 'c9f0a1103ea307e5e157e63e7915b38f83d27ca3':
  Adding getManagedUserBadgedDrawableForDensity() to PackageManager.
2016-03-03 01:31:18 +00:00
Chris Tate
d493ed6c0c Merge "Add API to clear a specific wallpaper" into nyc-dev 2016-03-03 01:30:35 +00:00
Renat Aksitov
6bfc3bd8f8 Merge "Voice Messaging Intent API." into nyc-dev
am: 8351ff25a1

* commit '8351ff25a1ef25dad69cf45431ba8aa82487bcd5':
  Voice Messaging Intent API.
2016-03-03 01:25:56 +00:00
Yohei Yukawa
c4759151c4 Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev
am: 3d68c9d30f

* commit '3d68c9d30fa9c95b49a9d6c8ba6db12dac47c2d7':
  Add more JavaDoc to InputConnectionWrapper.
2016-03-03 01:22:45 +00:00
Christopher Tate
79a2457e19 Add API to clear a specific wallpaper
There was previously no public API for clearing the keyguard wallpaper
versus the system wallpaper, or both.  Now there is.

Bug 27400185

Change-Id: If1789dd430040acdf16d77413c0e4b46bf3789f3
2016-03-02 17:05:25 -08:00
Vadim Tryshev
c9f0a1103e Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev 2016-03-03 00:28:17 +00:00
Renat Aksitov
8351ff25a1 Merge "Voice Messaging Intent API." into nyc-dev 2016-03-02 23:47:25 +00:00
Yohei Yukawa
3d68c9d30f Merge "Add more JavaDoc to InputConnectionWrapper." into nyc-dev 2016-03-02 23:35:35 +00:00
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
Vadim Tryshev
66ae66a7f7 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: I2fd2f226f626fb2e6cda1cfe072013350e12b41c
2016-03-02 14:55:04 -08: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
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
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
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
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
Lorenzo Colitti
531a344300 Move PinningNetworkCallback out to a new NetworkPinner class.
Also add tests.

Bug: 19159232
Change-Id: Ic366b53259ee5944a8e864876425a6558c0a7216
2016-03-02 12:50:35 +09: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