Brian Duddie
3d730c0f2e
Merge "ContextHubService: Simplify hubId logic, ensure type correctness"
2017-01-18 02:09:22 +00:00
Sunny Goyal
d915dea643
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev am: 13f18efb8f
...
am: d52c1f879d
2017-01-18 01:57:26 +00:00
Sunny Goyal
9010bc5b27
Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates. am: 88959dccac
...
am: 7abfb108c9
2017-01-18 01:56:35 +00:00
TreeHugger Robot
626496effc
Merge "Camera2: Add secondary surface to OutputConfiguration"
2017-01-18 01:55:04 +00:00
Sunny Goyal
d52c1f879d
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev
...
am: 13f18efb8f
2017-01-18 01:51:35 +00:00
Sunny Goyal
7abfb108c9
Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates.
...
am: 88959dccac
2017-01-18 01:51:31 +00:00
Sunny Goyal
13f18efb8f
Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev
2017-01-18 01:45:55 +00:00
Makoto Onuki
d1c3379a34
Merge "Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev am: 5e2634ba55" into nyc-mr2-dev-plus-aosp
...
am: 908d4a911f
2017-01-18 01:42:44 +00:00
Makoto Onuki
510f207f95
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev am: 5e2634ba55
...
am: c99838288a
2017-01-18 01:42:38 +00:00
Kenny Guy
f70e4b42a2
Merge "Fix issue with saving admins before finishing loading. am: adbda7474c" into nyc-mr2-dev-plus-aosp
...
am: 04c2f3f2df
2017-01-18 01:40:52 +00:00
Kenny Guy
4228bcadb4
Fix issue with saving admins before finishing loading. am: adbda7474c
...
am: 4cccc791f4
2017-01-18 01:40:47 +00:00
Jeff Sharkey
90bd8930e5
Merge "Only measure each UID once in InstallerTest." am: 32aac7b9c9 am: 7b6d21b37e am: 5092952317
...
am: a199722ed6
2017-01-18 01:36:45 +00:00
Android Build Merger (Role)
908d4a911f
Merge "Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev am: 5e2634ba55" into nyc-mr2-dev-plus-aosp
2017-01-18 01:33:00 +00:00
Android Build Merger (Role)
04c2f3f2df
Merge "Fix issue with saving admins before finishing loading. am: adbda7474c" into nyc-mr2-dev-plus-aosp
2017-01-18 01:32:32 +00:00
Makoto Onuki
c99838288a
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev
...
am: 5e2634ba55
2017-01-18 01:31:37 +00:00
Kenny Guy
4cccc791f4
Fix issue with saving admins before finishing loading.
...
am: adbda7474c
2017-01-18 01:31:32 +00:00
Jeff Sharkey
a199722ed6
Merge "Only measure each UID once in InstallerTest." am: 32aac7b9c9 am: 7b6d21b37e
...
am: 5092952317
2017-01-18 01:30:24 +00:00
Makoto Onuki
5e2634ba55
Merge "Fix issue with saving admins before finishing loading." into nyc-mr2-dev
2017-01-18 01:26:59 +00:00
Jeff Sharkey
5092952317
Merge "Only measure each UID once in InstallerTest." am: 32aac7b9c9
...
am: 7b6d21b37e
2017-01-18 01:23:49 +00:00
Jeff Sharkey
7b6d21b37e
Merge "Only measure each UID once in InstallerTest."
...
am: 32aac7b9c9
2017-01-18 01:18:51 +00:00
Jeff Sharkey
32aac7b9c9
Merge "Only measure each UID once in InstallerTest."
2017-01-18 01:11:00 +00:00
TreeHugger Robot
870a2c12ab
Merge "Add build flag for container builds"
2017-01-18 00:57:24 +00:00
Jim Miller
f49d58a1aa
Merge "Link framework with static library to satisfy javac build dependency"
2017-01-18 00:52:19 +00:00
Selim Cinek
70c5c30afa
Merge changes Ic5ceb729,I51fab5be,Id7abd858,Ic5fce695,I14a75cd6, ...
...
* changes:
Fixed the interactivness of the shelf on the keyguard
Follow up fixes for expandhelper
Fix guts not expanding when QSPanel is expanded
Fixed an issue where the setVisibility wasn't annotated
Fixed a crash when a notification is updated
Improved the performance of the shelf / scrim
Fixed a caching issue where icons could stay greyscale
2017-01-18 00:46:00 +00:00
Shuzhen Wang
9c663d4415
Camera2: Add secondary surface to OutputConfiguration
...
Test: camera cts, and manually test camera preview/capture/recording.
Bug: 33777818
Change-Id: I853f2f48640e4b1ad20a468c152f7e9b536f7a3b
2017-01-17 16:38:39 -08:00
Adam Lesinski
fdaa9c58c9
Merge "New implementation of AssetManager/ResTable"
2017-01-17 23:58:36 +00:00
Mark Rathjen
8bd15d1df2
Merge "SSAID Migration to be Per App/User Unique Values."
2017-01-17 23:57:17 +00:00
Jeff Sharkey
f1eb6ea403
Merge "Invalidate installd when mounts change."
2017-01-17 23:52:15 +00:00
Kenny Guy
adbda7474c
Fix issue with saving admins before finishing loading.
...
Saving device policy managers settings to clear out
password stats was happening before initializing mAdminList
so could wipe active admins.
Test: manual - flash with N2G05C add google account with dmagent flash wth this fix, check dmagent is still an active admin, reboot check admin is still active.
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug: 34277435
Change-Id: I13660b47f30e9aba001eb13f2e457c3b3f36da3e
2017-01-17 23:37:57 +00:00
Svetoslav Ganov
f4b2e6d09d
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 0e9bda18ea" into nyc-mr2-dev-plus-aosp
...
am: 70f16f0d5f
2017-01-17 23:20:16 +00:00
Svetoslav Ganov
3e6e1d8a52
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 0e9bda18ea
...
am: 7414acbdbb
2017-01-17 23:20:09 +00:00
Svetoslav Ganov
a92ad0dbe8
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 70c0f5c2c7" into nyc-mr2-dev-plus-aosp
...
am: d07d3a9826
2017-01-17 23:18:16 +00:00
Svetoslav Ganov
7f18ed8829
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 70c0f5c2c7
...
am: 272220caff
2017-01-17 23:18:12 +00:00
Selim Cinek
c681346ad6
Fixed the interactivness of the shelf on the keyguard
...
The shelf could still be double-tapped on the lock screen.
Test: manual, tap on bottom part of last notification on lockscreen
Change-Id: Ic5ceb729e28095b90e96da85acd3da3d65110ccf
Fixes: 33766648
2017-01-17 15:17:59 -08:00
Selim Cinek
c25af40002
Follow up fixes for expandhelper
...
Change-Id: I51fab5bee481889101e8f5553b9a5d9fe2cba6c3
Test: manual
2017-01-17 15:17:59 -08:00
dongwan0605.kim
fc975d6343
Fix guts not expanding when QSPanel is expanded
...
When exposing notification guts, we notified height changed event
without expandable view(row). Then, when QSPanel is expanded,
NotificationPanelView did not update its height and guts was not
expanded properly due to lack of height.
So fix it by notifying height changed event with expandable view
when expose notification guts.
Also, do not request animation when panel is collapsed.
Test: Expand QSPanel > Long press on the collapsed notification >
Verify guts expanded properly
Change-Id: Id7abd858800036fd6ff11c003c079c84c7ea54ef
2017-01-17 15:17:58 -08:00
Svetoslav Ganov
fa66823cd1
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36" into nyc-mr2-dev-plus-aosp
...
am: b1b2414a08
2017-01-17 23:16:44 +00:00
Svetoslav Ganov
6528c7342c
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36
...
am: 629cf8c948
2017-01-17 23:16:40 +00:00
Selim Cinek
d3b4a1b9bd
Fixed an issue where the setVisibility wasn't annotated
...
The setVisibility method wasn't properly using the
@RemotableViewMethod and therefore certain notifications
could not be sent.
Change-Id: Ic5fce695486d53f1b327d3137cbe67beacfaafb9
2017-01-17 15:16:09 -08:00
Svetoslav Ganov
3e6041557a
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: f5111345d2
...
am: aa493da365
2017-01-17 23:15:25 +00:00
Xiaohui Chen
387c65f639
Add build flag for container builds
...
Test: lunch and build
Bug: 34350397
Change-Id: Ideb14200b5056449055ca17d868c615548445dc9
2017-01-17 15:12:26 -08:00
Android Build Merger (Role)
70f16f0d5f
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 0e9bda18ea" into nyc-mr2-dev-plus-aosp
2017-01-17 23:12:12 +00:00
Android Build Merger (Role)
d07d3a9826
Merge "Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea am: 70c0f5c2c7" into nyc-mr2-dev-plus-aosp
2017-01-17 23:12:06 +00:00
Svetoslav Ganov
7414acbdbb
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea
...
am: 0e9bda18ea
2017-01-17 23:11:31 +00:00
Svetoslav Ganov
272220caff
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction." into nyc-mr1-dev am: 332762aaf0 am: df459cb2ea
...
am: 70c0f5c2c7
2017-01-17 23:11:28 +00:00
Android Build Merger (Role)
b1b2414a08
Merge "[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74 am: 631370fa36" into nyc-mr2-dev-plus-aosp
2017-01-17 23:11:13 +00:00
Svetoslav Ganov
629cf8c948
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74
...
am: 631370fa36
2017-01-17 23:10:20 +00:00
Svetoslav Ganov
aa493da365
[DO NOT MERGE] Prevent crash from early Toast surface destruction. am: 016c9c8cb5 am: a7ff8fbe74
...
am: f5111345d2
2017-01-17 23:10:17 +00:00
Selim Cinek
9b047d897d
Merge "Not allowing foreground services to be cleared as children" into nyc-mr2-dev am: c8278f35c7
...
am: 03a4c8417e
2017-01-17 23:09:23 +00:00
Selim Cinek
6b802214c9
Not allowing foreground services to be cleared as children am: 1d35979f0a
...
am: fd1b667c94
2017-01-17 23:08:20 +00:00
