OSDN Git Service
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
am:
8b0e069815
Change-Id: Id8c2004d6e1e4db786244afd1de48d14d21bba57
TreeHugger Robot [Fri, 11 Aug 2017 19:55:19 +0000 (19:55 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp
Yin-Chia Yeh [Fri, 11 Aug 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
am:
0cfad57566
Change-Id: Ifd52c1db5d999dbcaa1855edfda6d60edc384b2a
Beverly [Fri, 11 Aug 2017 19:40:35 +0000 (19:40 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
am:
3e4e9e234a
Change-Id: Ibce8d8983efc859d4c37168c900303db49f4e69a
Julia Reynolds [Fri, 11 Aug 2017 19:28:29 +0000 (19:28 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
am:
24a94491e4
Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5
TreeHugger Robot [Fri, 11 Aug 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:19:10 +0000 (19:19 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 19:16:17 +0000 (19:16 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
Tyler Gunn [Fri, 11 Aug 2017 19:12:24 +0000 (19:12 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d am:
347e5ff103
am:
cc1552a2a3
Change-Id: Iac3cd7f26b7a6e7134b9de6b34cdddb2b3e72d4e
Tyler Gunn [Fri, 11 Aug 2017 19:03:20 +0000 (19:03 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d
am:
347e5ff103
Change-Id: I1a53bf75715c4d7d1b2fbd7ebf6dc96c06b78a2f
Tyler Gunn [Fri, 11 Aug 2017 18:47:18 +0000 (18:47 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed
am:
63769af59d
Change-Id: I798dc5b56fb8f212153d87e71ac088ba177875b8
Tyler Gunn [Fri, 11 Aug 2017 18:33:44 +0000 (18:33 +0000)]
Merge changes from topic 'call-session-may'
am:
21e4dbb6ed
Change-Id: I20a3a9f7808211187da8434a0b1490081a92e8d8
Julia Reynolds [Fri, 11 Aug 2017 18:33:32 +0000 (18:33 +0000)]
Merge "usb string update" into oc-mr1-dev
am:
e25757a106
Change-Id: I2c9f9096eeb849191050ed543c7e024ebc088db0
TreeHugger Robot [Fri, 11 Aug 2017 18:18:42 +0000 (18:18 +0000)]
Merge "usb string update" into oc-mr1-dev
Tyler Gunn [Fri, 11 Aug 2017 18:14:02 +0000 (18:14 +0000)]
Merge changes from topic 'call-session-may'
* changes:
Add callSessionMayHandover API to ImsCallSession.
IMS: Support for Possible Call Session Handover
Neil Fuller [Fri, 11 Aug 2017 18:06:46 +0000 (18:06 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
am:
252efbcf40
Change-Id: I41d4e0d8c0fbf0eb1bdf0d1722da3626e0b97213
Steven Moreland [Fri, 11 Aug 2017 17:57:59 +0000 (10:57 -0700)]
Fix android_os_Debug nativehelper headers.
Test: links
Bug:
63762847
Change-Id: I3936b4b7021597de7289ace62ebf9946d2db339c
Nate Fischer [Fri, 11 Aug 2017 17:53:47 +0000 (17:53 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
am:
a9732da1f3
Change-Id: I38c1ea8090d96861cf2f9a261d9e350766a672ce
Neil Fuller [Fri, 11 Aug 2017 17:50:58 +0000 (17:50 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
Nate Fischer [Fri, 11 Aug 2017 17:49:24 +0000 (17:49 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
am:
070e3c0c7f
Change-Id: Ia0405fb1d7a4410100c5c9c98ed64655f06c9e8b
TreeHugger Robot [Fri, 11 Aug 2017 17:38:11 +0000 (17:38 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev
Nate Fischer [Fri, 11 Aug 2017 17:36:42 +0000 (17:36 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev
Kevin Chyn [Fri, 11 Aug 2017 17:34:20 +0000 (17:34 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
am:
60409a9255
Change-Id: I19afe423ad9a4f0c9897dd82802e37412072e55c
TreeHugger Robot [Fri, 11 Aug 2017 17:26:07 +0000 (17:26 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev
Beverly [Fri, 11 Aug 2017 17:04:11 +0000 (17:04 +0000)]
Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev
am:
2593d707f7
Change-Id: I6eef49657f2c8da590b3428738366d9ead115e2f
TreeHugger Robot [Fri, 11 Aug 2017 16:56:10 +0000 (16:56 +0000)]
Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev
Mathieu Chartier [Fri, 11 Aug 2017 16:48:01 +0000 (16:48 +0000)]
Merge "Add dirty_image_objects file." into oc-mr1-dev
am:
f56c63b23f
Change-Id: I96a2387593151d115b3d0b966f6cb7352ae236f8
Julia Reynolds [Fri, 11 Aug 2017 16:36:54 +0000 (16:36 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev
am:
b4472f4bde
Change-Id: I2f59a6c174a9ab43cb91f9636755b5bbe7f68669
Mathieu Chartier [Fri, 11 Aug 2017 16:32:32 +0000 (16:32 +0000)]
Merge "Add dirty_image_objects file." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 16:22:59 +0000 (16:22 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev
Philipp Weiß [Fri, 11 Aug 2017 15:39:37 +0000 (15:39 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
am:
7aab318c96
Change-Id: Ic28442491b56012b2c5993754d623ba7203cfa59
Philipp Weiß [Fri, 11 Aug 2017 15:33:05 +0000 (15:33 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev
Julia Reynolds [Fri, 11 Aug 2017 15:26:04 +0000 (11:26 -0400)]
Explicitly allow shell to update listener/assist
Oddly, this was flaky; sometimes shell could update
the entries
Fixes:
63793946
Test: cts
cts-tradefed run cts-dev --module DevicePolicyManager
--test com.android.cts.devicepolicy.ManagedProfileTest
cts-tradefed run cts-dev --module DevicePolicyManager --test
com.android.cts.devicepolicy.ManagedProfileTest
cts-tradefed run cts-dev --module DevicePolicyManager
--test com.android.cts.devicepolicy.ManagedProfileTest
Change-Id: I5cc6d6a49ad083e68cac1717f97b025966619102
Neil Fuller [Fri, 11 Aug 2017 12:22:36 +0000 (13:22 +0100)]
Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.
This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.
Bug:
64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit
8bb4140516c0e18d6c3cbb4215cedc306a2a6da9)
Julia Reynolds [Fri, 11 Aug 2017 13:05:20 +0000 (09:05 -0400)]
usb string update
Change-Id: Ib55ce7dbb0e9e5d25e01fd70b99cad5494cd619c
Fixes:
63157187
Test: make
Android Build Merger (Role) [Fri, 11 Aug 2017 13:07:27 +0000 (13:07 +0000)]
Merge "Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours am:
f4e45257c8 -s ours" into oc-mr1-dev-plus-aosp
Esteban Talavera [Fri, 11 Aug 2017 13:03:01 +0000 (13:03 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours
am:
f4e45257c8 -s ours
Change-Id: Iee95196f7015c375f9d8c92ff1950d104cf98de5
Esteban Talavera [Fri, 11 Aug 2017 13:03:00 +0000 (13:03 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours
am:
d9d5d43f89 -s ours
Change-Id: I8a1b01e124ac1e368c90702d93d5c4fc8b2572d7
Esteban Talavera [Fri, 11 Aug 2017 12:54:40 +0000 (12:54 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 am:
e50bea8662 -s ours
am:
4879880724 -s ours
Change-Id: I0ee0c9ea7a6647830352f44499ad3f5fcc81c817
Esteban Talavera [Fri, 11 Aug 2017 12:50:36 +0000 (12:50 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours
am:
b6ba151a6f -s ours
Change-Id: Idc2edc2fe727a5054c2bafb2ab01cbdfdc5a9d71
Esteban Talavera [Fri, 11 Aug 2017 12:50:34 +0000 (12:50 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours
am:
b6ba151a6f -s ours
Change-Id: Ie26efb399e409d4ca90b434f9dbe6ee648d08c36
Esteban Talavera [Fri, 11 Aug 2017 12:42:59 +0000 (12:42 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3
am:
e50bea8662 -s ours
Change-Id: I95659fa0abcfa619a88cb2d3d0e6d2ede4186a53
Esteban Talavera [Fri, 11 Aug 2017 12:34:06 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3
Change-Id: I0183d9fb699f38af155c3684cc74daa875c22ec4
Esteban Talavera [Fri, 11 Aug 2017 12:34:00 +0000 (12:34 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
am:
49bef543b3 -s ours
Change-Id: I69369945e8fc5c1090c8ee217b5d193f5fb1236d
TreeHugger Robot [Fri, 11 Aug 2017 12:25:01 +0000 (12:25 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev
Adrian Roos [Fri, 11 Aug 2017 12:20:21 +0000 (12:20 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
am:
3d558d8dd8
Change-Id: I2a05c3b5cbfe1f8bbd92ac85bc7544ab2c18b177
TreeHugger Robot [Fri, 11 Aug 2017 12:10:46 +0000 (12:10 +0000)]
Merge "FRP: clear FRP when setup complete if not set up" into oc-mr1-dev
Tony Mak [Fri, 11 Aug 2017 10:51:49 +0000 (10:51 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
am:
106dc34fb2
Change-Id: I9dd602dd5cb0e6a5d11f22fd8ffd1b3b6efdf471
TreeHugger Robot [Fri, 11 Aug 2017 10:42:24 +0000 (10:42 +0000)]
Merge "Fix the strings accordingly for policy transparency dialogs" into oc-mr1-dev
phweiss [Wed, 5 Jul 2017 16:54:54 +0000 (18:54 +0200)]
Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.
Bug:
63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit
679dc2492ce1286a44c9dcd60e18dc97dd886a0a)
Christofer Åkersten [Fri, 11 Aug 2017 03:10:54 +0000 (03:10 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
am:
a6d62d7b8d
Change-Id: I7aefc986591b5ee379a121b10a6fcca9d1929fef
TreeHugger Robot [Fri, 11 Aug 2017 03:00:21 +0000 (03:00 +0000)]
Merge "Remove preloaded media route resources" into oc-mr1-dev
Fyodor Kupolov [Fri, 11 Aug 2017 01:38:24 +0000 (01:38 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
am:
0ee1e6d3c1
Change-Id: I8c22fb94b4e59426b8832a4bae5d2717090256d2
Nate Fischer [Thu, 10 Aug 2017 06:02:36 +0000 (23:02 -0700)]
WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API
This adds a dedicated API for fetching a URL for the Safe Browsing
reporting privacy policy.
This URL should be displayed by applications on custom Safe Browsing
interstitials.
Bug:
64077668
Test: make update-api (it compiles and javadocs look good)
Change-Id: I2873260edcaa924e68517c8679079e147b9995f4
Android Build Merger (Role) [Fri, 11 Aug 2017 01:32:30 +0000 (01:32 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437 am:
acdaaea57e" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Fri, 11 Aug 2017 01:28:01 +0000 (01:28 +0000)]
Merge "Removed isUserStoppingOrShuttingDownLocked" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 01:27:39 +0000 (01:27 +0000)]
Merge "Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp am:
fa6fb4c068" into oc-mr1-dev-plus-aosp
Kevin Chyn [Fri, 11 Aug 2017 01:26:47 +0000 (01:26 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437
am:
acdaaea57e
Change-Id: Ibb15331f28dbe105e7febdead34a752ff6328247
Kevin Chyn [Fri, 11 Aug 2017 01:22:43 +0000 (01:22 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp
am:
fa6fb4c068
Change-Id: I72ad306a62e999cb15b469887371a1d950228fbf
Android Build Merger (Role) [Fri, 11 Aug 2017 01:22:10 +0000 (01:22 +0000)]
Merge "Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev am:
3cb64c2c51" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 11 Aug 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308 am:
c6edfb16ac -s ours am:
d061c2dde0 -s ours" into oc-mr1-dev-plus-aosp
Sudheer Shanka [Fri, 11 Aug 2017 01:18:34 +0000 (01:18 +0000)]
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
am:
3cb64c2c51
Change-Id: I80f8971b0f0f55ce91a0e1a3d574ae4a577f9257
Brad Ebinger [Fri, 11 Aug 2017 01:15:52 +0000 (01:15 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308 am:
c6edfb16ac -s ours
am:
d061c2dde0 -s ours
Change-Id: If094587b044bcf7c1d025dd914fd8b1f37e0865f
Android Build Merger (Role) [Fri, 11 Aug 2017 01:12:50 +0000 (01:12 +0000)]
Merge "Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am:
cad75e2437" into oc-dr1-dev-plus-aosp
Kevin Chyn [Fri, 11 Aug 2017 01:11:41 +0000 (01:11 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev
am:
5f2ba81c06
Change-Id: Iaa0c94a9325ef944ddb6b62c2e80e39ef3bbb21a
Kevin Chyn [Fri, 11 Aug 2017 01:09:34 +0000 (01:09 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Ib609a68d8da9eab5e4993565c61aec9ea6b1ba35
Kevin Chyn [Fri, 11 Aug 2017 01:08:09 +0000 (01:08 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
am:
cad75e2437
Change-Id: Iff57ca1a3b59517218085239e23c68a4315230e1
Brad Ebinger [Fri, 11 Aug 2017 01:07:31 +0000 (01:07 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7 am:
44da663308
am:
c6edfb16ac -s ours
Change-Id: I0d3fd87e85541df08541ea3a16dd2ae3b32d9941
Sudheer Shanka [Fri, 11 Aug 2017 01:05:43 +0000 (01:05 +0000)]
Merge "DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs." into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 01:01:58 +0000 (01:01 +0000)]
Merge "FP permission checks should not crash system process" into oc-mr1-dev
TreeHugger Robot [Fri, 11 Aug 2017 00:59:08 +0000 (00:59 +0000)]
Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev
Brad Ebinger [Fri, 11 Aug 2017 00:55:01 +0000 (00:55 +0000)]
Merge "Change IMS callback AIDLs to be oneway" am:
a46600e0e7
am:
44da663308
Change-Id: I7d68f608242c81c7be1da1c83669baf38b9e9fcc
Steven Moreland [Fri, 11 Aug 2017 00:50:50 +0000 (00:50 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
am:
1e8d712b78
Change-Id: I52b50aec4319183bebacaf7fb03e51dd6b51157a
Brad Ebinger [Fri, 11 Aug 2017 00:42:30 +0000 (00:42 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
am:
a46600e0e7
Change-Id: If849e9ed61271bf233f4e149ef766e2e7b0d7851
TreeHugger Robot [Fri, 11 Aug 2017 00:40:18 +0000 (00:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" into oc-dr1-dev-plus-aosp
Treehugger Robot [Fri, 11 Aug 2017 00:31:41 +0000 (00:31 +0000)]
Merge "Change IMS callback AIDLs to be oneway"
Brad Ebinger [Thu, 10 Aug 2017 23:37:24 +0000 (23:37 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8 am:
3fff521160 -s ours
am:
f4f815c2cb -s ours
Change-Id: Ie2e35c298bab0024cb800c8f104b82b7ca026161
Brad Ebinger [Thu, 10 Aug 2017 23:24:43 +0000 (23:24 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d am:
bc13df8ce8
am:
3fff521160 -s ours
Change-Id: I0bf3f2a70920df6c36741ea78220e235d6ed769a
Christofer Åkersten [Thu, 10 Aug 2017 23:04:48 +0000 (08:04 +0900)]
Remove preloaded media route resources
Remove system preloads previously removed in ag/
2549555 and mistakenly
readded in merge ag/
2691682.
Bug:
64567067
Bug:
64534957
Change-Id: I707ebf9f998aaeb472e41ebde2802db3d3f20a4d
Test: build
Brad Ebinger [Thu, 27 Jul 2017 19:57:03 +0000 (12:57 -0700)]
Change IMS callback AIDLs to be oneway
A bad behaving service was causing the IMS registration
callbacks to block indefinetly waiting for the callback
binder implementation in another process to finish. Since
we update the IMS registration in a loop, we were never getting
to the updates for the other processes.
This change moves the AIDL definition to oneway. Since these
are callback AIDLs, the caller doesn't need to wait
for the callbacks to return before sending the others.
Bug:
63137625
Test: Manual
Merged-In: I0e049166ddf3604d312748b63a94fa6ebe77c29d
Change-Id: Id39b6b70aa20bb9986bf293abe2f9e683da4252e
Brad Ebinger [Thu, 10 Aug 2017 23:11:44 +0000 (23:11 +0000)]
Merge "Add method that checks the Binder status of ImsConfig" am:
6ffc855e8d
am:
bc13df8ce8
Change-Id: I7d73cade826c47b902c875b9543cb50fb19631d9
Sudheer Shanka [Thu, 10 Aug 2017 23:06:43 +0000 (23:06 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
am:
06668b5f73
Change-Id: I34efad16363ca2b21374967bfabfc8fa2f36ee94
Brad Ebinger [Thu, 10 Aug 2017 23:02:56 +0000 (23:02 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
am:
6ffc855e8d
Change-Id: Ifa04b6260d51c17dc323fab918db0bdbf2bdea64
Android Build Merger (Role) [Thu, 10 Aug 2017 23:00:50 +0000 (23:00 +0000)]
Merge "Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61 am:
2436cb76b9" into oc-mr1-dev-plus-aosp
Steven Moreland [Thu, 10 Aug 2017 22:55:12 +0000 (15:55 -0700)]
ScopedUtfChars: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using ScopedUtfChars find headers
Bug:
63762847
Change-Id: I5e9f2b56f569b83ece0d854f7066655e1d64cc65
Phil Weaver [Thu, 10 Aug 2017 22:56:35 +0000 (22:56 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61
am:
34f79a67ee
Change-Id: I4a100110f61930abbb8a501ea897359bfe064f38
Phil Weaver [Thu, 10 Aug 2017 22:56:34 +0000 (22:56 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev am:
a5dab05b61
am:
2436cb76b9
Change-Id: I273fba5f4dc74346a83d1e63cf7759aa3b6a3070
Sudheer Shanka [Thu, 10 Aug 2017 22:52:40 +0000 (22:52 +0000)]
Merge "Update ConnOnActivityStartTest to be hermetic." into oc-mr1-dev
Jeff Hao [Mon, 31 Jul 2017 20:35:01 +0000 (13:35 -0700)]
Add dirty_image_objects file.
Allows grouping of classes with dirty static fields to be grouped
together in the image to have fewer dirty pages.
Bug:
62554875
Test: mm test-art-host
(cherry picked from commit
37641ae54ab72509276d0fdd3f0fabeea9988c4a)
Change-Id: Ibc30b13edb9554f79df86e98253ae318a5ece342
Brad Ebinger [Thu, 10 Aug 2017 22:50:45 +0000 (22:50 +0000)]
Merge "Add method that checks the Binder status of ImsConfig"
Yin-Chia Yeh [Thu, 10 Aug 2017 22:41:50 +0000 (15:41 -0700)]
Camera: fix legacy device CTS failure
Bug:
64259581
Test: emulator CTS failure is fixed
Change-Id: I9988ffb7877c3f5d62c82ab3c7b8744720824fba
Phil Weaver [Thu, 10 Aug 2017 22:44:47 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am:
a5dab05b61
Change-Id: If2bbb15d9609260272d74e3fc8c7de7c9789fa2d
Phil Weaver [Thu, 10 Aug 2017 22:44:39 +0000 (22:44 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
am:
a5dab05b61
Change-Id: I31f4ce541ac56887549a654b5e313e1f361152c3
Sudheer Shanka [Thu, 10 Aug 2017 19:02:31 +0000 (12:02 -0700)]
DO NOT MERGE: Update BatteryStatsImpl to handle change in no. of freqs.
Bug:
62240247
Test: cts-tradefed run singleCommand cts-dev -m CtsIncidentHostTestCases -t \
com.android.server.cts.BatteryStatsValidationTest
Change-Id: I1328fe7bf29229e9563cde6eea80addf2b91ea5d
Phil Weaver [Thu, 10 Aug 2017 22:34:03 +0000 (22:34 +0000)]
Merge "Stop focusing views before layout." into oc-dr1-dev
John Reck [Thu, 10 Aug 2017 22:09:13 +0000 (22:09 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev
am:
eb43cdbc2e
Change-Id: I4e3680df1f475bc6f15ff8c3ab0bdc8b887607a3
John Reck [Thu, 10 Aug 2017 21:57:02 +0000 (21:57 +0000)]
Merge "Delete all ro.hwui.* props" into oc-mr1-dev
Beverly [Wed, 26 Jul 2017 18:13:40 +0000 (14:13 -0400)]
Pleasant sound implemented for in-call notif.
Replacing tone generator with an audio file for in-call notifications from text messages.
Fixes:
38194285
Test: runtest -x frameworks/base/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java
Change-Id: I9ec28ff54ae259ae906b3db08ece7059707c7edb
Julia Reynolds [Thu, 10 Aug 2017 20:58:54 +0000 (16:58 -0400)]
Group new free notis if autogroup summary exists
In the case where an app posted enough notifications to
get an autogrpup summary, but then canceled most of them,
add all new group-less notifications to the autogroup summary
even if the total number of notifications currently posted
by the app is < the autogroup trigger number
Test: runtest systemui-notification, cts
Change-Id: I6f7a8a0140abcff2b0f78eacfbf23cfab12897fa
Fixes:
64158706
Beverly [Thu, 10 Aug 2017 18:55:34 +0000 (14:55 -0400)]
Previous active volume dialog remains above a11y.
When the volume dialog is unexpanded, the a11y volume
slider displays below the current active volume stream. Previously,
when adjusting a11y volume, the previous active stream's volume dialog
row goes out of view once a11y becomes the active stream.
This caused the a11y volume dialog row to display strangely.
Now, the previous active volume dialog remains above the a11y volume
dialog when adjusting a11y volume.
Change-Id: Ice09a5c52dc524956bc5acf33f27bfd4a9843400
Fixes:
64326406
Test: manual