Adrian Roos
0ded7c8578
Merge "AOD: Implement redacted notificatinos" into oc-dev
...
am: 89e8b7b58e
2017-04-18 00:50:02 +00:00
Sungsoo Lim
a8647cb547
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
...
am: a44d7cd25b
2017-04-18 00:46:57 +00:00
Sungsoo Lim
09c3bdd1db
Merge "MediaBrowser: Revert Search API" into oc-dev
...
am: 51d91bff17
2017-04-18 00:37:33 +00:00
TreeHugger Robot
89e8b7b58e
Merge "AOD: Implement redacted notificatinos" into oc-dev
2017-04-18 00:31:59 +00:00
Sungsoo Lim
a44d7cd25b
Merge "Revert "MediaSession: Add methods for queue managements"" into oc-dev
2017-04-18 00:31:35 +00:00
Sungsoo Lim
51d91bff17
Merge "MediaBrowser: Revert Search API" into oc-dev
2017-04-18 00:26:26 +00:00
Adrian Roos
a4f06716da
Merge "AOD: Do not show guts nor snooze" into oc-dev
...
am: 96da371a6d
2017-04-18 00:17:26 +00:00
Dianne Hackborn
6aeb47b83d
Merge "Fix issue #36858643 : Runtime restart on OPR1.170323.002" into oc-dev
...
am: 4bcc9bf0f2
2017-04-18 00:15:46 +00:00
TreeHugger Robot
96da371a6d
Merge "AOD: Do not show guts nor snooze" into oc-dev
2017-04-18 00:08:05 +00:00
TreeHugger Robot
4bcc9bf0f2
Merge "Fix issue #36858643 : Runtime restart on OPR1.170323.002" into oc-dev
2017-04-18 00:04:50 +00:00
Todd Kennedy
cdd5253b1a
Merge "only log calling package for instant apps" into oc-dev
...
am: 00168492a8
2017-04-18 00:04:11 +00:00
Mike Tsao
b1167d30a5
Merge "Cleanup that wasn't uploaded with ag/2094132" into oc-dev
...
am: 3244faae29
2017-04-18 00:03:01 +00:00
Winson Chung
302c49a559
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
...
am: c2627353c4
2017-04-18 00:01:44 +00:00
TreeHugger Robot
00168492a8
Merge "only log calling package for instant apps" into oc-dev
2017-04-17 23:57:38 +00:00
TreeHugger Robot
3244faae29
Merge "Cleanup that wasn't uploaded with ag/2094132" into oc-dev
2017-04-17 23:53:54 +00:00
TreeHugger Robot
c2627353c4
Merge "Tightening up rotation behavior for PIP (3/3)" into oc-dev
2017-04-17 23:50:27 +00:00
Adrian Roos
56af059ac6
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
...
am: d7852f4363
2017-04-17 23:49:08 +00:00
TreeHugger Robot
d7852f4363
Merge "AppErrors: Add test for AppErrorDialog.onCreate" into oc-dev
2017-04-17 23:41:38 +00:00
Yifan Hong
f06e0479fb
Merge changes from topic 'vintf_check_compat_native' am: 6d033475b3 am: 4fccec4f81
...
am: ee93d9da20
2017-04-17 23:34:32 +00:00
jiabin
02b100c62b
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
...
am: 4fba6e62a1
2017-04-17 23:30:01 +00:00
TreeHugger Robot
4fba6e62a1
Merge "TIF: Add preview parameter to filter only preview or non-preview channels." into oc-dev
2017-04-17 23:25:26 +00:00
Julia Reynolds
47101fc1b0
Merge "Notification settings can contain dashboard settings" into oc-dev
...
am: 38323f50c7
2017-04-17 23:24:43 +00:00
TreeHugger Robot
38323f50c7
Merge "Notification settings can contain dashboard settings" into oc-dev
2017-04-17 23:16:37 +00:00
Chris Craik
9c66ae77a0
Merge "Disable crashing drop shadow tests" into oc-dev
...
am: 9d67b50308
2017-04-17 23:16:22 +00:00
Geoffrey Pitsch
dcceca2341
Merge "Accessibility for Notification Inline Controls" into oc-dev
...
am: 8c3a371bf3
2017-04-17 23:15:01 +00:00
TreeHugger Robot
9d67b50308
Merge "Disable crashing drop shadow tests" into oc-dev
2017-04-17 23:11:15 +00:00
TreeHugger Robot
8c3a371bf3
Merge "Accessibility for Notification Inline Controls" into oc-dev
2017-04-17 23:07:56 +00:00
Geoffrey Pitsch
8f6784bbaf
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
...
am: dc2dd6ed9b
2017-04-17 23:05:32 +00:00
Geoffrey Pitsch
dc2dd6ed9b
Merge "Warning if app targeting O posts a notification with no channel" into oc-dev
2017-04-17 22:59:07 +00:00
Jason Monk
5e511e588d
Merge "Fix up color issues as a result of theme change" into oc-dev
...
am: 8604ac3af5
2017-04-17 22:50:33 +00:00
Jason Monk
5efe531874
Merge "Status bar updates" into oc-dev
...
am: c5e04dbfd4
2017-04-17 22:49:05 +00:00
Adrian Roos
1a1ecfcf5a
AOD: Implement redacted notificatinos
...
Test: Turn on "show sensitive notifications on lockscreen", receive notification, observe AOD
Bug: 36610748
Change-Id: I981ef4cea7cefc76dcd55ebad9d05c758927dabb
2017-04-17 15:41:09 -07:00
Jeff Sharkey
aead06b971
Merge "Storage API polishing." into oc-dev
...
am: 200d72d933
2017-04-17 22:39:20 +00:00
Jason Monk
8604ac3af5
Merge "Fix up color issues as a result of theme change" into oc-dev
2017-04-17 22:32:55 +00:00
Jason Monk
c5e04dbfd4
Merge "Status bar updates" into oc-dev
2017-04-17 22:32:14 +00:00
Adrian Roos
5ed5068b07
Merge "AOD: Track missed AOD time ticks" into oc-dev
...
am: e7b581bca9
2017-04-17 22:27:47 +00:00
Jeff Sharkey
200d72d933
Merge "Storage API polishing." into oc-dev
2017-04-17 22:26:44 +00:00
Jason Monk
256a7f3926
Merge "Fix date going missing in QS" into oc-dev
...
am: ff9a2790b7
2017-04-17 22:26:20 +00:00
TreeHugger Robot
e7b581bca9
Merge "AOD: Track missed AOD time ticks" into oc-dev
2017-04-17 22:16:21 +00:00
TreeHugger Robot
ff9a2790b7
Merge "Fix date going missing in QS" into oc-dev
2017-04-17 22:06:11 +00:00
Jesse Hall
6ad1bdb9b2
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
...
am: 16338a4450
2017-04-17 21:55:21 +00:00
Adrian Roos
0da67d661e
AppErrors: Add test for AppErrorDialog.onCreate
...
Also refactor to make sure we always remove the TIMEOUT
message and clear the mProc.mCrashDialog field, even when
dismissing without the Handler.
Bug: 37351370
Test: runtest -c com.android.server.am.AppErrorDialogTest frameworks-services
Change-Id: If9fb348e8ed83c6c1c0f48fa7fd27ffd33b530f2
2017-04-17 14:55:19 -07:00
Todd Kennedy
56279cb0e1
only log calling package for instant apps
...
Change-Id: I71b09fd130f27d5814638fdaaec33f759b0b2346
Fixes: 37425492
Test: manual
2017-04-17 14:53:49 -07:00
Jesse Hall
16338a4450
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
2017-04-17 21:52:26 +00:00
Mike Tsao
6c9c14e745
Merge "Add tests for ag/2086796" into oc-dev
...
am: 7c31e7924c
2017-04-17 21:52:02 +00:00
Winson Chung
ef4dc81d50
Tightening up rotation behavior for PIP (3/3)
...
- Fixing up edge case when SysUI resizing conflicts with updating the
display rotation bounds. When an interaction causes both a display
rotation and a resize from SystemUI, we should defer the resize animation
until the rotation has been propagated to SystemUI, otherwise the bounds
used will be incorrect.
Bug: 36879891
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: Ife1b7ab0c2f1f11f33cbc9614778ff49a28c79f6
2017-04-17 14:49:31 -07:00
Mike Tsao
0a20cf7ca4
Cleanup that wasn't uploaded with ag/2094132
...
I saw that Tree Hugger had verified, and hit submit without
remembering to repo upload the last patch set containing toddke's
most recent set of suggestions.
Bug: 37192695
Test: runtest -c com.android.server.pm.PackageManagerServiceTest frameworks-services
Change-Id: I4d6376165aaa615007891ba045c9b5c34e4b0394
(cherry picked from commit 338d332873
2017-04-17 21:48:33 +00:00
Mike Tsao
7c31e7924c
Merge "Add tests for ag/2086796" into oc-dev
2017-04-17 21:46:38 +00:00
Julia Reynolds
c04cb25cdb
Merge "Add user to channel/group modification callbacks." into oc-dev
...
am: 1ed2771450
2017-04-17 21:40:09 +00:00
Julia Reynolds
8d70a6eaa3
Notification settings can contain dashboard settings
...
Bug: 36562211
Test: NotificationSettingsTests, RunSettingsRoboTests
Change-Id: I4da338a90e0f094202bae73f9bd8622b37a3acf6
2017-04-17 17:29:30 -04:00
