OSDN Git Service
Steven Moreland [Fri, 11 Aug 2017 22:28:23 +0000 (22:28 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours am:
7c9f93d832 -s ours
am:
d5593e0f19 -s ours
Change-Id: Ieb4c1ef120eca3bab9c561adb1295c8dd9ed39de
Cindy Kuang [Fri, 11 Aug 2017 21:57:15 +0000 (21:57 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp am:
1c634381b1
am:
d7522c5c8c
Change-Id: I8e0c0e818a260b64fe95492d4244a77fd675cb79
Steven Moreland [Fri, 11 Aug 2017 21:48:37 +0000 (21:48 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7 am:
99cb134bf2 -s ours
am:
7c9f93d832 -s ours
Change-Id: I3b96834e93a0787075902b6464c0b6cbef9d102e
Cindy Kuang [Fri, 11 Aug 2017 21:48:21 +0000 (21:48 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
e4f02db258 am:
51bc4b6c32
am:
c5f6633fdc
Change-Id: I2dc793d60ec75c340b9ae64a0464303e92b41c62
Cindy Kuang [Fri, 11 Aug 2017 21:43:11 +0000 (21:43 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp am:
a54ab7edf4
am:
3e85fa11ea
Change-Id: I3219a23702cb0d597093f03d2bebcf21722ca695
Cindy Kuang [Fri, 11 Aug 2017 21:38:13 +0000 (21:38 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
am:
1c634381b1
Change-Id: Ib24f1f55eadcb9076fd81014c2afcab7e173ca4e
Cindy Kuang [Fri, 11 Aug 2017 21:33:43 +0000 (21:33 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2 am:
e4f02db258
am:
51bc4b6c32
Change-Id: I2f04732899a58b64ffb820d62a53a70c1b723f8c
Steven Moreland [Fri, 11 Aug 2017 21:33:42 +0000 (21:33 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594 am:
e04a0bf5c7
am:
99cb134bf2 -s ours
Change-Id: I17668ddde69926f6648d75f2b74f54f234fc5c02
Pankaj Kanwar [Fri, 11 Aug 2017 21:33:23 +0000 (21:33 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b am:
b30749b60f
am:
1b7a9c9a49
Change-Id: I60e31f7734b28954ab110292466826b376184798
Android Build Merger (Role) [Fri, 11 Aug 2017 21:26:53 +0000 (21:26 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
07f5257b19" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:24:02 +0000 (21:24 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers" am:
75c9e4d594
am:
e04a0bf5c7
Change-Id: I3e4e01a5e328ede527ee49d36ac828205994639d
Cindy Kuang [Fri, 11 Aug 2017 21:22:42 +0000 (21:22 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
07f5257b19
Change-Id: I74c7e7906b4cdcaefc65787ce4d9fcf35a2cecb3
Cindy Kuang [Fri, 11 Aug 2017 21:20:11 +0000 (21:20 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev am:
dc12cb1fb2
am:
e4f02db258
Change-Id: I14c80bbd8838b6af2010463e9d1fb25cf537a167
Cindy Kuang [Fri, 11 Aug 2017 21:16:29 +0000 (21:16 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp
am:
a54ab7edf4
Change-Id: I0350cf5af828990539d0fa9ec925feef54348a49
Pankaj Kanwar [Fri, 11 Aug 2017 21:11:25 +0000 (21:11 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev am:
bcfa22584b
am:
b30749b60f
Change-Id: Ie6d0c953dcab31ef98dc68bed1e88e496331f333
Android Build Merger (Role) [Fri, 11 Aug 2017 21:08:13 +0000 (21:08 +0000)]
Merge "Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65 am:
1e6401b07e" into oc-dr1-dev-plus-aosp
Steven Moreland [Fri, 11 Aug 2017 21:07:06 +0000 (21:07 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
am:
75c9e4d594
Change-Id: I170b5846981683eacee1081587c7149bab454d91
Cindy Kuang [Fri, 11 Aug 2017 21:06:56 +0000 (21:06 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
am:
dc12cb1fb2
Change-Id: Ida5507009926a936ee247c2f43f44b439351d937
Todd Kennedy [Fri, 11 Aug 2017 21:02:30 +0000 (21:02 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev am:
20c2641ad4
am:
f567dd46da
Change-Id: Ic3c9beaff7aca8e9a46595b1511ef7023fe980ac
Cindy Kuang [Fri, 11 Aug 2017 21:01:15 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I094bd99bcaaf51633ac887d38a9323ed5fdc54e2
Pankaj Kanwar [Fri, 11 Aug 2017 21:01:13 +0000 (21:01 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
am:
bcfa22584b
Change-Id: I4cdef151e4a826cee965954352f101c3bdd86d09
Cindy Kuang [Fri, 11 Aug 2017 21:01:11 +0000 (21:01 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev am:
0580ac8a65
am:
1e6401b07e
Change-Id: I48f9a5fc207a2c884e51c9091bd19db9bdf15471
Pankaj Kanwar [Fri, 11 Aug 2017 20:52:52 +0000 (20:52 +0000)]
Merge "Catch BadParcelableException in RemoteConnection when setting extras." into oc-dr1-dev
Neil Fuller [Fri, 11 Aug 2017 20:50:32 +0000 (20:50 +0000)]
Merge "Change SystemApi as per API council feedback"
Todd Kennedy [Fri, 11 Aug 2017 20:49:00 +0000 (20:49 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev
am:
20c2641ad4
Change-Id: Ie4917755c4936d8afc876aeb60fda4ee225fadb4
Cindy Kuang [Fri, 11 Aug 2017 20:45:24 +0000 (20:45 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
am:
0580ac8a65
Change-Id: I7138667ba48fa590c4a7f30cdecf0381c43050a6
Treehugger Robot [Fri, 11 Aug 2017 20:40:35 +0000 (20:40 +0000)]
Merge "ScopedUtfChars: use proper nativehelper headers"
Beverly [Fri, 11 Aug 2017 20:39:36 +0000 (20:39 +0000)]
Merge "Merge "Each package can enqueue one toast at a time." into oc-mr1-dev am:
a606d1049f" into oc-mr1-dev-plus-aosp
am:
4bb0eb9fb2
Change-Id: I9196d40986ae51f5e308a48940a7c6f8d88609c0
Cindy Kuang [Fri, 11 Aug 2017 20:38:35 +0000 (20:38 +0000)]
Merge "docs: corrected grammar mistake in Class Overview" into oc-dev
Cindy Kuang [Fri, 11 Aug 2017 20:33:34 +0000 (20:33 +0000)]
Merge "docs: replaced "i.e." to fix formatting error" into oc-dev
Steven Moreland [Fri, 11 Aug 2017 20:31:08 +0000 (20:31 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2 am:
93d8497094 am:
29327cbed9
am:
7de64d2771
Change-Id: Id59a9457ba34bce71a2bba579ac9b7cf452699da
TreeHugger Robot [Fri, 11 Aug 2017 20:29:03 +0000 (20:29 +0000)]
Merge "Save observer in call to commit" into oc-mr1-dev
Android Build Merger (Role) [Fri, 11 Aug 2017 20:28:43 +0000 (20:28 +0000)]
Merge "Merge "Each package can enqueue one toast at a time." into oc-mr1-dev am:
a606d1049f" into oc-mr1-dev-plus-aosp
Beverly [Fri, 11 Aug 2017 20:23:51 +0000 (20:23 +0000)]
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
am:
a606d1049f
Change-Id: Ib1685574483b83968b4fc14f788d3496a436c096
Steven Moreland [Fri, 11 Aug 2017 20:20:29 +0000 (20:20 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2 am:
93d8497094
am:
29327cbed9
Change-Id: I93c10835f80d9330c2d7dfd02db97df34005e7b6
Steven Moreland [Fri, 11 Aug 2017 20:17:24 +0000 (20:17 +0000)]
Merge "Fix android_os_Debug nativehelper headers." into oc-dr1-dev-plus-aosp am:
8b0e069815
am:
92a7a63d93
Change-Id: Ia24c4c3e2c3754509934576e30e500f1f5aa1a12
TreeHugger Robot [Fri, 11 Aug 2017 20:15:58 +0000 (20:15 +0000)]
Merge "Each package can enqueue one toast at a time." into oc-mr1-dev
Steven Moreland [Fri, 11 Aug 2017 20:12:31 +0000 (20:12 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master am:
3f378940c2
am:
93d8497094
Change-Id: Ib2a80b747bd1a0c4692a89d17bd96eeb03dbe46e
Steven Moreland [Fri, 11 Aug 2017 20:04:15 +0000 (20:04 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am:
3f378940c2
Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e
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
Yin-Chia Yeh [Fri, 11 Aug 2017 20:03:53 +0000 (20:03 +0000)]
Merge "Camera: fix legacy device CTS failure" into oc-mr1-dev am:
0cfad57566
am:
df7d855072
Change-Id: I945d6ef3bad30a96c1ff1457b793bf5270e6950e
Beverly [Fri, 11 Aug 2017 19:59:43 +0000 (19:59 +0000)]
Merge "Previous active volume dialog remains above a11y." into oc-mr1-dev am:
3e4e9e234a
am:
b463d29a62
Change-Id: I1ceeef9d0dcdd5bd0c5607ecc76e000608c3ca5f
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
TreeHugger Robot [Fri, 11 Aug 2017 19:53:32 +0000 (19:53 +0000)]
Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
Julia Reynolds [Fri, 11 Aug 2017 19:49:50 +0000 (19:49 +0000)]
Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev am:
24a94491e4
am:
4d47f34633
Change-Id: Ica35f6b3716f76d6e29fbec3e62bc7117ad524ec
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
Tyler Gunn [Fri, 11 Aug 2017 19:26:19 +0000 (19:26 +0000)]
Merge changes from topic 'call-session-may' am:
21e4dbb6ed am:
63769af59d am:
347e5ff103 am:
cc1552a2a3
am:
c3860b3b52
Change-Id: I7039033d15a4ca4b1fd76a26ca9a1104697c2e44
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
Julia Reynolds [Fri, 11 Aug 2017 18:48:05 +0000 (18:48 +0000)]
Merge "usb string update" into oc-mr1-dev am:
e25757a106
am:
abca4907d2
Change-Id: If915c7f08a7d383f7afb5430ebdd087cf96b9b0c
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
Neil Fuller [Fri, 11 Aug 2017 18:18:40 +0000 (18:18 +0000)]
Merge "Change SystemApi as per API council feedback" into oc-mr1-dev am:
252efbcf40
am:
a4d8a47f4c
Change-Id: I82ab3968e96bf1b37bd16cb8f0177a59342749c7
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
Nate Fischer [Fri, 11 Aug 2017 18:10:52 +0000 (18:10 +0000)]
Merge "WebView: remove unused DATA_REDUCTION_PROXY_SETTING_CHANGED API" into oc-mr1-dev am:
a9732da1f3
am:
e1a8030fc9
Change-Id: Ic6af76454398ab9934e635759f7271ad28313e08
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
Nate Fischer [Fri, 11 Aug 2017 18:04:45 +0000 (18:04 +0000)]
Merge "WebView: add WebView#getSafeBrowsingPrivacyPolicyUrl() API" into oc-mr1-dev am:
070e3c0c7f
am:
56a9c82325
Change-Id: If3247f4b91fc4b8d3dce2d8c77a3976260a69f34
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
Steven Moreland [Fri, 11 Aug 2017 17:52:35 +0000 (10:52 -0700)]
Reference ScopedUtfChar header correctly.
Bug:
63762847
Test: finds header in proper location
Change-Id: I4963ab3133c405a90564112f0d9af602ace0eab5
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
Kevin Chyn [Fri, 11 Aug 2017 17:49:51 +0000 (17:49 +0000)]
Merge "Reset fingerprint lockout upon successful unlock" into oc-mr1-dev am:
60409a9255
am:
4b7539e42b
Change-Id: Ib778ed967d874e3eb4ccc3645adcc5d38c08996f
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 16:49:56 +0000 (12:49 -0400)]
Each package can enqueue one toast at a time.
Change-Id: I5fe3db663d1d13ece8c670ca60bdc76dcaa5cc72
Fixes:
64529000
Test: manual
Todd Kennedy [Fri, 11 Aug 2017 17:15:04 +0000 (10:15 -0700)]
Save observer in call to commit
The observer used to be saved in a round-about way; being passed
to the "commit" message handler and set there. The idea was that
if there were multiple calls to commit() with different observers,
it would be strange to wipe out the first observer during the
second call to commit. However, setting the observer only in the
commit handler means there are other methods [namely abandon()
and setPermissionsResult()] where the observer will either not
be called unless the commit message handler was run or the first
observer might be wiped out with multiple commit calls.
The only way to track this properly would be to generate a
commit ID and assign an observer with that commit ID. However,
there doesn't appear to be a legit use case for a caller to invoke
commit multiple times on the same session with different observers.
So, we just set the observer directly in the commit() method.
Change-Id: I5e0d6c163ea84d1f49780aa899afb2e1cdf17584
Fixes:
64564511
Test: cts-tradefed run commandAndExit cts-dev -t android.appsecurity.cts.PkgInstallSignatureVerificationTest#testInstallEphemeralRequiresV2Signature -m CtsAppSecurityHostTestCases
Beverly [Fri, 11 Aug 2017 17:14:00 +0000 (17:14 +0000)]
Merge "Pleasant sound implemented for in-call notif." into oc-mr1-dev am:
2593d707f7
am:
6e23bfc386
Change-Id: Ie046074ea546764115677c5ca3e0163c2e90641b
Mathieu Chartier [Fri, 11 Aug 2017 17:06:49 +0000 (17:06 +0000)]
Merge "Add dirty_image_objects file." into oc-mr1-dev am:
f56c63b23f
am:
74aa95fbb2
Change-Id: I09b4a3ba762a31ffc395bb3a840b3eb5a2e00b6a
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
Julia Reynolds [Fri, 11 Aug 2017 16:51:52 +0000 (16:51 +0000)]
Merge "Group new free notis if autogroup summary exists" into oc-mr1-dev am:
b4472f4bde
am:
07497c39d5
Change-Id: I71ccf034a1789c333c46f914ffa4b6bbcdd0f9a0
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
Sudheer Shanka [Fri, 11 Aug 2017 16:44:01 +0000 (16:44 +0000)]
Merge "Use cpu freq times to calculate power consumed by an uid."
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
Tony Mantler [Fri, 11 Aug 2017 16:28:49 +0000 (16:28 +0000)]
Merge "Don't lose dialogs during configuration change"
Tyler Gunn [Fri, 11 Aug 2017 16:24:41 +0000 (09:24 -0700)]
Catch BadParcelableException in RemoteConnection when setting extras.
Unlike the code in Telecom which can use Bundle.setDefusable(..), this
framework code is used within a Connection Manager's code space, so the
setDefusable method does not work.
To prevent crashing the Connection Manager's app, catching the exception
and ignoring extras in this case (not much else we can do).
I've also filed a bug against the offending component known for putting
bad parcelables into the extras.
Test: Modified code to force this scenario.
Bug:
64499462
Change-Id: If44ad2e2c8e285d513969c6babe5a798242da53d
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:52:41 +0000 (15:52 +0000)]
Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" into oc-mr1-dev am:
7aab318c96
am:
4b4df1c891
Change-Id: Ia2140b81e35d7eee75399a8902ad3af415034765
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)
TreeHugger Robot [Fri, 11 Aug 2017 14:41:20 +0000 (14:41 +0000)]
Merge "Change SystemApi as per API council feedback"
Julia Reynolds [Fri, 11 Aug 2017 13:05:20 +0000 (09:05 -0400)]
usb string update
Change-Id: Ib55ce7dbb0e9e5d25e01fd70b99cad5494cd619c
Fixes:
63157187
Test: make
Neil Fuller [Fri, 11 Aug 2017 13:28:32 +0000 (14:28 +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 third of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the old
constant.
Bug:
64568899
Test: None, build only
Change-Id: I75731b13ce2046556d6148aa5707cab6ed9cf9bf
Esteban Talavera [Fri, 11 Aug 2017 13:24:03 +0000 (13:24 +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
am:
057da39d89 -s ours
Change-Id: Icc3fc5ff09bf66d00c4e4d1f2f633cd6bf33c26b
Esteban Talavera [Fri, 11 Aug 2017 13:19:35 +0000 (13:19 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 -s ours am:
b6ba151a6f -s ours am:
d9d5d43f89 -s ours
am:
ff19365761 -s ours
Change-Id: I60fd8db5104d86ac6c437fbf1d67a6675450ec3a
Esteban Talavera [Fri, 11 Aug 2017 13:09:12 +0000 (13:09 +0000)]
Merge "Enforce policy for camera gesture in keyguard" into oc-dev am:
49bef543b3 am:
e50bea8662 -s ours am:
4879880724 -s ours
am:
84c9c5c400 -s ours
Change-Id: I10b1d89d681e341e6b9fd35d9b604c43c7cc2bd3
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