Philip P. Moltmann
82b902204f
Revert accidential merge 492a058d58
...
Test: Clean revert
Change-Id: I61d339bb85936e1d50742be1e4c6dab781f3a4e7
2017-02-14 17:02:50 -08:00
TreeHugger Robot
f5e107140d
Merge "Flush addPersistentPreferredActivity setting in DPMS"
2017-02-14 20:15:34 +00:00
Yohei Yukawa
e1748fa306
Merge "Take state snapshot in IMMS#attachNewInputLocked()"
2017-02-14 20:12:31 +00:00
Doris Liu
1740f1f1f1
Merge "Fix start time modification outside of updatePlayTime()"
2017-02-14 20:08:22 +00:00
Doris Liu
e8a5d8d211
Fix start time modification outside of updatePlayTime()
...
BUG: 35340235
Test: manually start the chrome photos app, no crash
and CTS at: ag/1908702
Change-Id: I3c0a6f140ee497020b562f25cade241dcd993c2a
2017-02-14 11:54:40 -08:00
Colin Cross
4114a9597a
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d am: 6c1ac4dd80 am: 29fd14f9ee
...
am: 886d642fb6
2017-02-14 19:28:36 +00:00
Colin Cross
886d642fb6
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d am: 6c1ac4dd80
...
am: 29fd14f9ee
2017-02-14 19:22:27 +00:00
Nick Vaccaro
710a285110
Merge "Sensors: Add LOW_LATENCY_OFFBODY_DETECT sensor API"
2017-02-14 19:21:37 +00:00
Colin Cross
29fd14f9ee
Merge "Use asm-5.2 prebuilt" am: 6b32770d6d
...
am: 6c1ac4dd80
2017-02-14 19:17:24 +00:00
TreeHugger Robot
7776844d77
Merge "SysUiLeaks: Turn leak reporting because of known leak"
2017-02-14 19:16:53 +00:00
Colin Cross
6c1ac4dd80
Merge "Use asm-5.2 prebuilt"
...
am: 6b32770d6d
2017-02-14 19:10:18 +00:00
Colin Cross
6b32770d6d
Merge "Use asm-5.2 prebuilt"
2017-02-14 19:03:46 +00:00
TreeHugger Robot
79b9853f49
Merge "Disable TaskSnapshots to fix crashes for DP."
2017-02-14 18:55:25 +00:00
TreeHugger Robot
744c774b68
Merge "include SkRegion.h explicitly (SkCanvas.h no longer does)"
2017-02-14 18:48:21 +00:00
TreeHugger Robot
723eac769e
Merge "Use DevicePolicyData#mUserSetupComplete for DPM's isDeviceProvisioned."
2017-02-14 18:47:53 +00:00
Daniel Nishi
646b56c844
Merge "Don't show game and music apps in Other Apps."
2017-02-14 18:45:33 +00:00
Robin Lee
3cb867326a
Merge "Theme work lock activity with the task primaryColor"
2017-02-14 18:38:14 +00:00
Philip P. Moltmann
492a058d58
resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp
...
am: b02f8eb241
2017-02-14 18:28:25 +00:00
Orion Hodson
8a9670d662
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b am: 49e0cad3e1 am: 4105747ec3
...
am: 2e5e232fa7
2017-02-14 18:23:50 +00:00
Manu Cornet
ca170752d8
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev am: f47658f120
...
am: ec42e34422
2017-02-14 18:21:27 +00:00
songjinshi
96c92f25dd
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d am: d0e81464bd
...
am: c2b7dd0db4
2017-02-14 18:20:15 +00:00
Erik Kline
ea50c00f28
Merge "Verify duplicate upstream notifications are ignored" am: 3d57eb0bdc am: 02e71f6245 am: 8055dafb08
...
am: d850804723
2017-02-14 18:19:01 +00:00
Tony Mak
288639860a
Flush addPersistentPreferredActivity setting in DPMS
...
To fix the glitch that "kiosk mode" does not persist if device
is rebooted within 10s after addPersistentPreferredActivity is called.
Test: Manual Test
1. Using TestDPC to start kisok mode, reboot right away.
Observed that TestDPC is launched in kiosk mode.
2. Stop the kiosk mode, reboot without 10s.
Kisok mode is stopped.
Fix: 28169791
Change-Id: I555fc18efe86380f2e028b698c2bdb01017bf9f5
2017-02-14 18:18:48 +00:00
Erik Kline
6bf2e10802
Merge "Cleanup in the face of upstream error" am: ed6d75d5f3 am: 76e6f790db am: 663ec79cb2
...
am: ea7e8f7352
2017-02-14 18:17:43 +00:00
Badhri Jagan Sridharan
f82013b425
Merge changes from topic 'pixel-c' into nyc-mr2-dev am: dee514fae3
...
am: fa207eb889
2017-02-14 18:16:29 +00:00
Philip P. Moltmann
b02f8eb241
resolve merge conflicts of d043a840f7 to nyc-mr2-dev-plus-aosp
...
Test: Clean merge
Change-Id: Ib2420ff793fdf22fd80cfaed7848ff6b8be8d382
2017-02-14 09:51:16 -08:00
Yohei Yukawa
357b2f60e1
Take state snapshot in IMMS#attachNewInputLocked()
...
With this CL, we can finally start taking a state snapshot every time
IMMS#attachNewInputLocked() gets called, which allows us to include
the last N (currently set to 16) history of such snapshots in dumpsys
from InputMethodManagerService:
adb shell dumpsys input_method
This is a huge milestone for us to start relying more on historical
debugging rather than logcat-based debugging.
Test: Run `adb shell dumpsys input_method` to make sure that
"mStartInputHistory" entries are updated.
Bug: 35079353
Change-Id: Icb29c4ef0703553ead8654d3255a554de6d1a9b4
2017-02-14 09:40:03 -08:00
Robert Carr
280d1e55ef
Disable TaskSnapshots to fix crashes for DP.
...
Renderthread can't crash in system server if you don't
have Renderthread in system server.
Bug: 34817544
Bug: 34840652
Test: Basically a revert
Change-Id: Ic7384b8b1f22459f4a299a84425af91515a92551
2017-02-14 09:12:18 -08:00
Peeyush Agarwal
1ea19d3463
Merge "Fix KeyboardShortcuts show"
2017-02-14 17:10:02 +00:00
TreeHugger Robot
3571b79c7f
Merge "Pass targetSdkVersion specifier for SELinux labeling"
2017-02-14 16:54:46 +00:00
Adrian Roos
fb2bb3f099
SysUiLeaks: Turn leak reporting because of known leak
...
Test: use device for a while, observe that no notifications are posted
Bug: 35345376
Change-Id: I8814cb540f4d8d840312e29fce4a28fee317e787
2017-02-14 17:44:15 +01:00
Orion Hodson
2e5e232fa7
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b am: 49e0cad3e1
...
am: 4105747ec3
2017-02-14 16:20:31 +00:00
Orion Hodson
4105747ec3
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60" am: 3023906b1b
...
am: 49e0cad3e1
2017-02-14 16:14:08 +00:00
Orion Hodson
49e0cad3e1
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
...
am: 3023906b1b
2017-02-14 16:07:28 +00:00
Philip P. Moltmann
d043a840f7
Merge "[DO NOT MERGE] Revert "[DO NOT MERGE] Delay SharedPreferences.apply() by 50 ms"" into nyc-mr2-dev
2017-02-14 16:03:32 +00:00
Orion Hodson
3023906b1b
Merge "Import CallSite classes and BootstrapMethodError class from ojdk8u60"
2017-02-14 16:02:33 +00:00
TreeHugger Robot
2c92e9daa4
Merge "Reject HMAC keys smaller than 64 bits."
2017-02-14 15:58:31 +00:00
TreeHugger Robot
02761acc67
Merge "Declarative downloadable fonts"
2017-02-14 15:39:04 +00:00
TreeHugger Robot
a10b057bb8
Merge "MonitoringCertTask no longer relies on software.device_admin"
2017-02-14 15:35:04 +00:00
Manu Cornet
ec42e34422
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
...
am: f47658f120
2017-02-14 15:30:21 +00:00
Diego Perez
dacc137752
Merge "A bit of warning cleanup"
2017-02-14 15:25:37 +00:00
TreeHugger Robot
f47658f120
Merge "2D Recents: Fix a glitch during task relayout after a dismiss" into nyc-mr2-dev
2017-02-14 15:24:45 +00:00
songjinshi
c2b7dd0db4
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18 am: f69a73793d
...
am: d0e81464bd
2017-02-14 14:39:14 +00:00
songjinshi
d0e81464bd
Merge "[NotificationManagerService]: Fixes the thread-safe issue." am: d530d1bf18
...
am: f69a73793d
2017-02-14 14:34:13 +00:00
songjinshi
f69a73793d
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
...
am: d530d1bf18
2017-02-14 14:29:36 +00:00
Treehugger Robot
d530d1bf18
Merge "[NotificationManagerService]: Fixes the thread-safe issue."
2017-02-14 14:23:19 +00:00
TreeHugger Robot
ab582b762a
Merge "Replace bitmap shaders with image shaders in test code"
2017-02-14 14:21:38 +00:00
Shreyas Basarge
bf6655b315
Merge "BackupManager#cancelBackups() API"
2017-02-14 13:53:33 +00:00
Shreyas Basarge
c3704427c9
BackupManager#cancelBackups() API
...
Introduces a cancelBackups() API for
BackupManager. When this function returns,
it is guaranteed that currently running
backup operations won't interact with
the active transport.
Bug: 34760860
Ref: https://docs.google.com/document/d/18MnfwkDfKNtXQBPRmL8vpVgfLgSWJsDja1Nm1QV5hOw/edit#heading=h.9p6yo0wx44k3
Test: GTS tests at ag/1893365
Change-Id: I67f78699bbe763ea71c85937fbc01a5b48694eed
2017-02-14 13:51:59 +00:00
Lenka Trochtova
5108f1efa6
Use DevicePolicyData#mUserSetupComplete for DPM's isDeviceProvisioned.
...
DevicePolicyData#mUserSetupComplete on user 0 us a more accurate and
reliable indicator of whether the device has been provisioned than
the currently used 'ro.device_owner' property.
Test: gts-tradefed run gts -m GtsGmscoreHostTestCases --test com.google.android.gts.devicepolicy.DevicePolicyManagerTest
BUG: 29935702
Change-Id: Iec62f2aebe865ac0ee69c2cc7177333ce5450474
2017-02-14 14:44:06 +01:00
