311064 Commits

Author SHA1 Message Date
Jerry Zhang
e30d5723e4 Merge "Add support for MTP perceived device type property." am: b6ed343e85 am: 7644b885c7
am: 136f37b88f

Change-Id: I446cd52e5fd8cda48e9af46ee3faee5578cae286
2017-03-20 21:54:28 +00:00
Bryce Lee
1514f9a69d Merge "Do not defer wm display logic when called from am." 2017-03-20 21:48:52 +00:00
Jerry Zhang
136f37b88f Merge "Add support for MTP perceived device type property." am: b6ed343e85
am: 7644b885c7

Change-Id: If09ce7609ff999c7dc32d7cc5db4917eae50748c
2017-03-20 21:46:01 +00:00
Jerry Zhang
7644b885c7 Merge "Add support for MTP perceived device type property."
am: b6ed343e85

Change-Id: I58417625aa6c669eb82af3a11a4e35c77952f539
2017-03-20 21:39:17 +00:00
TreeHugger Robot
a7353961bf Merge "Add token to the resolver APIs" 2017-03-20 21:25:34 +00:00
David Stevens
d01a9aeefe Merge "Prefer to launch activities on the source display" 2017-03-20 21:23:30 +00:00
Treehugger Robot
b6ed343e85 Merge "Add support for MTP perceived device type property." 2017-03-20 21:23:10 +00:00
TreeHugger Robot
5beefa697a Merge "Apps must opt into using icon badges." 2017-03-20 20:02:18 +00:00
TreeHugger Robot
273fbb15f4 Merge "StartHidlServices wait for StartSensorService." 2017-03-20 19:57:20 +00:00
TreeHugger Robot
45030ba62b Merge "Expose AIRPLANE_MODE_ON to Instant Apps" 2017-03-20 19:52:41 +00:00
TreeHugger Robot
e8e9d7c628 Merge "Expose Intents to Instant Apps" 2017-03-20 19:47:47 +00:00
Selim Cinek
7f424c79f9 Merge changes from topic 'revert_dozing'
* changes:
  Revert "NotificationWrappers: Factor out doze treatment"
  Revert "AOD: Use color filter to invert icons for AOD"
2017-03-20 19:35:29 +00:00
TreeHugger Robot
c8076f164a Merge "Expose Android ID to Instant Apps" 2017-03-20 19:29:10 +00:00
TreeHugger Robot
da3ab1a2dd Merge "use SkVertices::Builder in drawBitmapLattice override new virtual onDrawVerticesObject" 2017-03-20 19:23:08 +00:00
TreeHugger Robot
12b8ff31a2 Merge "Add android:label to ExternalStorageProvider." 2017-03-20 19:00:53 +00:00
Yifan Hong
604c12c06d StartHidlServices wait for StartSensorService.
Otherwise, StartHidlServices waits for more than a second
while holding a lock, delaying window manager.

Test: boots
Test: SystemServerTiming_StartWindowManagerService does not regress
Logcat shows:
SystemServerTimingAsync: StartSensorService took to complete: 55ms
SystemServerTiming: StartWindowManagerService took to complete: 81ms
SystemServerTiming: StartHidlServices took to complete: 1ms

Test: lshal shows android.frameworks.sensorservice@1.0::ISensorManager

Bug: 36389997
Change-Id: Iab5cf0ad7059cf9736cc7db0567dff51cc427b58
2017-03-20 11:30:19 -07:00
Todd Kennedy
d3c5106940 Add token to the resolver APIs
Change-Id: Ia6d4f6d88ec265480a4dca94fe77ef42592a328c
Fixes: 35442315
Test: Build and make sure instant apps still resolve
2017-03-20 11:23:06 -07:00
Chad Brubaker
1f6a266398 Expose AIRPLANE_MODE_ON to Instant Apps
Test: AIRPLANE_MODE_ON is accessible from Instant Apps
Bug:36444225
Change-Id: I9ab2c89844d2bd202924156a5e44ef40075fd467
2017-03-20 11:11:30 -07:00
Chad Brubaker
291df4fc0c Expose Intents to Instant Apps
This exposes Intents used by Android widgets to Instant Apps.

The following Intents are exposed:
Intent.ACTION_TIME_TICK
Intent.ACTION_DATE_CHANGED
Intent.ACTION_TIMEZONE_CHANGED
Intent.ACTION_TIME_CHANGED
Intent.ACTION_CONFIGURATION_CHANGED
Intent.ACTION_LOCALE_CHANGED
Intent.ACTION_SCREEN_OFF
Intent.ACTION_SCREEN_ON
Intent.ACTION_USER_PRESENT

Bug: 33350280
Test: Manually verified that broadcasts are received.
Change-Id: Ife94f594c1ff30f2625a57e1cc69f36cc00d1f34
2017-03-20 11:08:04 -07:00
TreeHugger Robot
ee741e9999 Merge "Load DevicePolicyManager only when needed in LockSettingsService" 2017-03-20 18:07:44 +00:00
Christine Franks
3910adfb62 Merge "Add color temperature preference for Night Display" 2017-03-20 18:03:49 +00:00
Chad Brubaker
1bed93742f Expose Android ID to Instant Apps
Android ID in O is scoped per-app but persistent across
installs. Since Instant Apps can use the cookie to implement similar
functionality its fine to expose.

In a follow up the Android ID generation will be made to depend on the
cookie so that clearing the cookie also breaks the persistence.

Bug: 36385889
Test: Manual
Change-Id: I09b993bb4153179b80eebe0da8dac3fad7b9c779
2017-03-20 10:57:40 -07:00
Yifan Hong
60968b9783 Merge "IUsb uses "default" service name" 2017-03-20 17:51:14 +00:00
Selim Cinek
934027a430 Revert "NotificationWrappers: Factor out doze treatment"
Bug: 36430936
This reverts commit edfb65bbc4eb0453c91355c9c2277fe5e96b135b.

Change-Id: I85f67d2f703bdc1bb8f2bedc19eacb5320b3c1d3
2017-03-20 17:46:02 +00:00
Selim Cinek
30d9bad767 Revert "AOD: Use color filter to invert icons for AOD"
Bug: 36430936
This reverts commit cc957752970c05de64272f33176395dfa2840486.

Change-Id: I1aa4a05d0bc823e02338693e1bf20786dd2ac019
2017-03-20 17:43:50 +00:00
Philip P. Moltmann
a5c560b328 Merge "Handle corrupted files when cutting out pages" 2017-03-20 17:41:32 +00:00
TreeHugger Robot
7d50ff11db Merge "Notify caller if none of settings are effective." 2017-03-20 17:37:15 +00:00
Bryce Lee
af3a400ead Do not defer wm display logic when called from am.
Currently we process any remove/add/change logic from the activity
manager to the window manager through a handler message. This opens
the possibility of the activity manager requesting display state
from a window manager that is a step behind.

This change modifies the call behavior so that these changes are done
synchronously between the two managers.

Change-Id: Icd19f37c62bfb7aad10fab2e1b21e41ac75052b5
Fixes: 35741135
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test CtsServicesHostTestCases android.server.cts.ActivityManagerDisplayTests#testCreateMultipleVirtualDisplaysH
2017-03-20 10:37:12 -07:00
Su, Weihua
c1afeb2750 Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf am: 69be98ae52
am: 5fc179b22d

Change-Id: I13a5780d407f596a7026d36d55130fa98eb0882f
2017-03-20 17:25:48 +00:00
Ryuki Nakamura
48be310e69 Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021 am: 900620cffc
am: 06659047f0

Change-Id: Ia7c8309f68d85a88e2a26169509d3e45d4d2ff69
2017-03-20 17:24:37 +00:00
Julia Reynolds
7d5b4da27f Apps must opt into using icon badges.
Test: make
Bug: 35941623
Change-Id: Ifdbbed2097228d1121f3eb03ecab9851d23a023f
2017-03-20 13:23:24 -04:00
Ben Lin
0df63e9080 Add android:label to ExternalStorageProvider.
Test: Builds.
Bug: 30138665
Change-Id: I6ac028f97c1451f9d78f7f5a0960f1a3f8bde5b7
2017-03-20 10:20:41 -07:00
Jorim Jaggi
7c8e0918a1 Merge "Remove thumbnail cache" 2017-03-20 17:19:11 +00:00
Su, Weihua
5fc179b22d Merge "Fix crash issue on Storage Manager app" am: cb4a3c55cf
am: 69be98ae52

Change-Id: Iaa7f97df590cbf93e1d5c942dae5f3be55988f11
2017-03-20 17:18:40 +00:00
Su, Weihua
69be98ae52 Merge "Fix crash issue on Storage Manager app"
am: cb4a3c55cf

Change-Id: If33e23972770c50cf83a42d8621d31b15b945524
2017-03-20 17:12:40 +00:00
Ryuki Nakamura
06659047f0 Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" am: a6ce3f3021
am: 900620cffc

Change-Id: I730e7c550b88325a418c419340e6f98080f89969
2017-03-20 17:12:39 +00:00
Daniel Nishi
9367f75071 Merge "Query app info as user for cache." 2017-03-20 17:07:01 +00:00
Treehugger Robot
cb4a3c55cf Merge "Fix crash issue on Storage Manager app" 2017-03-20 17:05:20 +00:00
Ryuki Nakamura
900620cffc Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()"
am: a6ce3f3021

Change-Id: I3f43b25622e5052e6336983da84b92e12f3e06dc
2017-03-20 17:05:16 +00:00
Treehugger Robot
a6ce3f3021 Merge "Fix NPE while performing NetworkStatsService.removeUidsLocked()" 2017-03-20 16:54:35 +00:00
TreeHugger Robot
95c471d7ab Merge "Remove unused using statement." 2017-03-20 16:34:39 +00:00
TreeHugger Robot
968ba922ad Merge "Don't backup deleted channels." 2017-03-20 16:25:20 +00:00
TreeHugger Robot
6388efb405 Merge "Inline Notification Controls to full spec" 2017-03-20 16:24:50 +00:00
Christine Franks
6418d0b890 Add color temperature preference for Night Display
Bug: 32463283
Test: adb shell settings put secure night_display_color_temperature
XXXX, where XXXX is {0, 2900, 4000, 7000}, and the temperatures
outside the valid range are capped at the min/max, respectively.
Change-Id: I322c0a907b30742fc312a9938fd0c47f679e580b
2017-03-20 09:07:17 -07:00
Jean-Michel Trivi
0a637ecd1b NotificationPlayer: fix typo in log
Test: n/a
Change-Id: I585f6ad39ef6dc0a93651deae6ca50051f732a1b
2017-03-20 08:47:58 -07:00
Jean-Michel Trivi
3e09b3c3fe Merge "NotificationPlayer: fix error listener, sync in playback thread" 2017-03-20 15:39:11 +00:00
Steven Moreland
8b44df35f1 Remove unused using statement.
Test: pass
Bug: 36099713
Change-Id: I07b90f9592fdd6b9c58ee52dc4f49f5e8b9f3459
2017-03-20 07:56:34 -07:00
Julia Reynolds
d0a5b1684a Don't backup deleted channels.
Change-Id: I58a23700c9f6ccf5d3d6b7fa9f80be78ef9421f0
Fixes: 36381209
Test: runtest systemui-notification
2017-03-20 14:55:16 +00:00
Geoffrey Pitsch
d0856f00c7 Inline Notification Controls to full spec
Based off redline spec
Support bundled notifications when long-press on summary
Hide banned text when sent from the default channel

Test: runtest systemui
Change-Id: I9315b4dc12cafbdf37ba9896879bfbe23c8d6921
2017-03-20 10:42:23 -04:00
Ben Wagner
95502300ef Merge "Use access directly instead of sk_exists." 2017-03-20 14:17:56 +00:00