Commit Graph

234362 Commits

Author SHA1 Message Date
Lorenzo Colitti
bfecba2938 Speed up ConnectivityServiceTest.
1. Override WakeupMessage with an implementation that uses
   sendEmptyMessageDelayed. This allows us to replace a
   6-second sleep with a 150ms wait.
2. Change waitFor()'s polling interval from 100ms to 50ms.

With these changes ConnectivityServiceTest goes from ~9s to ~3s.

Change-Id: Id78aab9cded90a5b17f09d7f437904e179808dd2
2016-03-02 17:01:50 +09: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
Wale Ogunwale
5b30f0df3f Merge "Enable add/remove window manager log points" into nyc-dev 2016-03-02 04:46:53 +00:00
Wale Ogunwale
3102c87a74 Enable add/remove window manager log points
To debug 27286867.

Bug: 27286867
Change-Id: Iab5e608f8437ee0e315bfa3d091980f4a9e3a3b5
2016-03-01 20:42:53 -08:00
Hyunyoung Song
c17fefe264 Merge "Update wallpaper asset for N dev preview Bug: 27434845" into nyc-dev 2016-03-02 04:40:49 +00:00
Hyunyoung Song
d9f91827a9 Update wallpaper asset for N dev preview
Bug: 27434845

Change-Id: I0f9ff168beab12d630ab824ab632f98051564570
2016-03-01 20:39:03 -08: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
Bryce Lee
aa8a5cd9bb DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles. am: 7c2539e2a5 -s ours
am: 21c47d1b22  -s ours

* commit '21c47d1b22cfa317d7925b01de1c13cc2a39b3d6':
  DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
2016-03-02 03:21:35 +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
Bryce Lee
21c47d1b22 DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
am: 7c2539e2a5  -s ours

* commit '7c2539e2a50ec3dcdb1c9420f9215bba438b21b6':
  DO NOT MERGE ANYWHERE Add way to query for supported Bluetooth profiles.
2016-03-02 03:12:09 +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
Fyodor Kupolov
5dbe1f30ef Merge "Restored switchTo method" into nyc-dev 2016-03-02 02:41:52 +00:00
Fyodor Kupolov
caab2666bd Restored switchTo method
It is current used in another branch. Restored to fix a breakage.

Change-Id: Iec98bf525b88b6b5b45bffb97a1f3e9b57c492dd
2016-03-01 18:39:27 -08: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
ab37f0f832 Merge "Start unaware persistent apps after user unlocked." into nyc-dev 2016-03-02 01:54:12 +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
f7d47f91fe Start unaware persistent apps after user unlocked.
Otherwise we'll never start them.  In particular, this fixes NFC.

Bug: 27360562
Change-Id: I9d430b1e377e63b35060b234f585ac180a369ad2
2016-03-01 18:38:55 -07:00
Insun Kang
542221d68a Merge "Annotate Media section of framework/base" into nyc-dev 2016-03-02 01:36:10 +00:00
Steve McKay
de5ec832b1 Merge "Fix roots filtering for move operations." into nyc-dev 2016-03-02 01:33:33 +00:00
Steve McKay
ea9ec291ed Fix roots filtering for move operations.
Add test coverage for the Downloads case.
This was a regression to my recent cleanup of RootInfo.
Fixed logic to not exclude basically *everything* when a
    directory is in the set of files to be copied.

Bug: 27303346
Change-Id: I4d5608e0d8d95448b027b20107a11a7a5e46d45e
2016-03-02 01:32:30 +00:00
Selim Cinek
049f6adfb8 Fixed a bug where the notification texts wouldn't animate
If the texts were the same but one had an ellipsis and the
other didn't, things were not animating nicely.

Bug: 27419215
Change-Id: Iaa9611e1cf60b6fe71113b76f36ab5c24e461961
2016-03-02 01:21:26 +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
Jeff Sharkey
8b609f3a96 Merge "Make preferred activities encryption aware." into nyc-dev 2016-03-02 00:52:35 +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
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
Jeff Sharkey
85f2ded23e Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev 2016-03-02 00:38:41 +00:00
Jeff Sharkey
888de830ed Merge "Sometimes to step forward, we need to go back. [1/2]" into nyc-dev 2016-03-02 00:38:33 +00:00
Yigit Boyar
5ae74b7fa6 Merge "Check if item is selectable before calling on click" into nyc-dev 2016-03-02 00:36:50 +00:00
Jeff Sharkey
fa6a1bc755 Sometimes to step forward, we need to go back. [2/2]
Change-Id: Iccabb95530a6e3c3950cb9a8dfe84e75354d2f5f
2016-03-01 17:36:23 -07:00
Lorenzo Colitti
7f2b6e2a84 Merge "Don't pass calling contexts into static services." into nyc-dev 2016-03-02 00:33:42 +00:00
Jeff Sharkey
9ad443f59c Sometimes to step forward, we need to go back. [1/2]
Change-Id: Ibff95298dc2e6c09675018ad0c45506589b6312a
2016-03-01 17:28:36 -07:00
Yigit Boyar
418d0cf5c9 Check if item is selectable before calling on click
This CL fixes a bug in ListView where it might call onClick on an
un-clickable if a new touch arrives before up timeout.

We could actually consider making child position non-changable
but that will change behavior. This seems safer approach.

Bug: 27198796
Change-Id: I7b15d04efa19d1d760a294bd027f3da3aaa3a445
2016-03-01 16:09:58 -08:00
Doris Liu
d25d2f5346 Merge "Revert "Temporarily disable AVD on RT"" into nyc-dev 2016-03-02 00:08:31 +00:00
John Reck
9ceab55d68 Revert "Temporarily disable AVD on RT"
This reverts commit 128a36526c.

Change-Id: Ibd687a9272d63feb842fba765b8b1d5165841527
2016-03-01 23:58:12 +00:00
John Reck
212cc4ebfa Merge "Temporarily disable AVD on RT" into nyc-dev 2016-03-01 23:58:05 +00:00
John Reck
128a36526c Temporarily disable AVD on RT
Bug: 27396097
Change-Id: I44324bca96e4a3a659d7222970c7e5d635a36383
2016-03-01 15:43:34 -08:00
Svetoslav Ganov
6cc1ba8e17 Merge "API for safe label to present in the UI" into nyc-dev 2016-03-01 23:42:20 +00:00
Anna Galusza
2e36a9e1c7 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 2016-03-01 23:39:09 +00:00
Fyodor Kupolov
285bec2641 Merge "Disable switching users if the user is in a call" into nyc-dev 2016-03-01 23:21:29 +00:00
Alan Viverette
90ed1eca3e Merge "Use Holo date/time picker layouts on very small screens" into nyc-dev 2016-03-01 23:13:43 +00:00
Svetoslav Ganov
2ab93cb22a Merge "Hide overlay windows in VR mode" into nyc-dev 2016-03-01 23:02:31 +00:00
Svetoslav Ganov
47d98de60b Hide overlay windows in VR mode
bug:26775563

Change-Id: I0e81cc64f281cd085ff642ebd93f32ceb3ad5480
2016-03-01 15:01:20 -08: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
Felipe Leme
2657492e5a Merge "Created netpolicy commands to manage UIDs blacklisted for network access while on background." into nyc-dev 2016-03-01 22:43:13 +00:00