OSDN Git Service
TreeHugger Robot [Thu, 30 Mar 2017 01:55:05 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 30 Mar 2017 01:46:23 +0000 (01:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
5acdc8c3d5 -s ours
am:
bcd06fab1d -s ours
Change-Id: If192805c88157baf69e8be9c55009145648b5e63
George Mount [Thu, 30 Mar 2017 01:42:59 +0000 (01:42 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev am:
ce3cf36652
am:
b81f36bb72
Change-Id: Ia3c9fe24b6a9aec4d2549668689efde46f3ee577
Bill Yi [Thu, 30 Mar 2017 01:40:45 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
5acdc8c3d5 -s ours
Change-Id: I86df56325e5d9aa00bd4b1c5cfa1f85123cec1c6
George Mount [Thu, 30 Mar 2017 01:37:30 +0000 (01:37 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
am:
ce3cf36652
Change-Id: I4ebe9cd31732ea45e77e6bb0a640160a90c910b0
TreeHugger Robot [Thu, 30 Mar 2017 01:30:06 +0000 (01:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:26:37 +0000 (01:26 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev am:
4e7bc119ae
am:
7a776f03a1
Change-Id: I6203f2cd4b83537f8c19ca308f6399182408b881
TreeHugger Robot [Thu, 30 Mar 2017 01:26:09 +0000 (01:26 +0000)]
Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
Pavlin Radoslavov [Thu, 30 Mar 2017 01:22:32 +0000 (01:22 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
am:
4e7bc119ae
Change-Id: I8bf6233fe843a13b0e49e6abc5bd490159442185
TreeHugger Robot [Thu, 30 Mar 2017 01:17:20 +0000 (01:17 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
Evan Rosky [Thu, 30 Mar 2017 01:15:46 +0000 (01:15 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev am:
7ac3fb2282
am:
f99eb172ae
Change-Id: I5bdc2a3617ab3cad61a00b495b724af8426c37c7
Evan Rosky [Thu, 30 Mar 2017 01:10:25 +0000 (01:10 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev
am:
7ac3fb2282
Change-Id: I615222fa4f1ee33c977daf771a15495e7771d2ca
Evan Rosky [Thu, 30 Mar 2017 01:02:22 +0000 (01:02 +0000)]
Merge "Expose initial focus feature flag for testing" into oc-dev
Abhijith Shastry [Thu, 30 Mar 2017 00:48:01 +0000 (00:48 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev am:
13dbbaf50a
am:
c8d771593a
Change-Id: Ia09b57636a3092b4c6b9af77126bbca72ac7da70
Adam Lesinski [Thu, 30 Mar 2017 00:41:25 +0000 (00:41 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev am:
c26ace0754
am:
719349cdb3
Change-Id: Icab08b15c92a8b88b7348e0caf61dba2f025de1b
Abhijith Shastry [Thu, 30 Mar 2017 00:40:30 +0000 (00:40 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev
am:
13dbbaf50a
Change-Id: I6174713b7b9a2b51bca56ffe680a00d0591a35dd
Adam Lesinski [Thu, 30 Mar 2017 00:40:28 +0000 (00:40 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev am:
86cb762ae6
am:
78b5fad19e
Change-Id: Id2bef485de9c4bf90e12846cc80a32da109cd26d
Adam Lesinski [Thu, 30 Mar 2017 00:36:24 +0000 (00:36 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
am:
c26ace0754
Change-Id: I5e2aba17860b27cd5f27d4b73c65775a74630881
TreeHugger Robot [Thu, 30 Mar 2017 00:35:57 +0000 (00:35 +0000)]
Merge "Update injectSmsPdu documentation." into oc-dev
Adam Lesinski [Thu, 30 Mar 2017 00:35:29 +0000 (00:35 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev
am:
86cb762ae6
Change-Id: Id175edab5f98cb062731c7d4064006f56f991a6d
Evan Rosky [Thu, 30 Mar 2017 00:33:51 +0000 (00:33 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev am:
37af93ad1c
am:
85aa3e82c7
Change-Id: I04c41ec0fa58d62e5f31c373b541e5dad57af184
Adam Lesinski [Thu, 30 Mar 2017 00:30:58 +0000 (00:30 +0000)]
Merge "AAPT2: Parse an ID encoded as a map" into oc-dev
Adam Lesinski [Thu, 30 Mar 2017 00:30:28 +0000 (00:30 +0000)]
Merge "AAPT2: Allow arbitrary entry names with aapt2 optimize" into oc-dev
Evan Rosky [Thu, 30 Mar 2017 00:29:48 +0000 (00:29 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
am:
37af93ad1c
Change-Id: I92254792b7681d1be53849ad3847dbb4e5318139
Evan Rosky [Thu, 30 Mar 2017 00:22:36 +0000 (00:22 +0000)]
Merge "Allow cluster navigation to jump into touchscreenBlocksFocus" into oc-dev
Android Build Merger (Role) [Thu, 30 Mar 2017 00:19:28 +0000 (00:19 +0000)]
Merge "Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe am:
7b4d1bbacc am:
70b93740c2"
TreeHugger Robot [Thu, 30 Mar 2017 00:18:48 +0000 (00:18 +0000)]
Merge "Add a service to rank apps for ResolverActivity."
Michael Plass [Thu, 30 Mar 2017 00:18:34 +0000 (00:18 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe am:
7b4d1bbacc
am:
70b93740c2
Change-Id: I13f2d13304b08e06a6ca4cd1dd25c512562113de
Nathan Harold [Thu, 30 Mar 2017 00:15:17 +0000 (00:15 +0000)]
Merge commit '
e45e328821ba' into oc-dev-plus-aosp
am:
560c9ec724
Change-Id: I136c31aa5b27a3520c93141d91d6198e2dae3a1d
Michael Plass [Thu, 30 Mar 2017 00:14:00 +0000 (00:14 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5 am:
37a1d983fe
am:
7b4d1bbacc
Change-Id: I1cc13641f08367784c772a08ec5aeffba08ea207
Robert Greenwalt [Thu, 30 Mar 2017 00:05:16 +0000 (00:05 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev am:
8931dc5d2f
am:
fb0ad3705d
Change-Id: I95c9d5d180b562664fbe6c78c4df9eb0a66c516b
Nathan Harold [Thu, 30 Mar 2017 00:05:10 +0000 (17:05 -0700)]
Merge commit '
e45e328821ba' into oc-dev-plus-aosp
Change-Id: I30ad9038be8faee57e5d6b1391d9e70a966a9a77
Michael Plass [Thu, 30 Mar 2017 00:02:58 +0000 (00:02 +0000)]
Merge "Remove implementation of bssid hotlist" am:
62c5f64fa5
am:
37a1d983fe
Change-Id: I546410e5a0efbbdddee526cd494ba33a6eb1005b
Robert Greenwalt [Thu, 30 Mar 2017 00:00:08 +0000 (00:00 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
am:
8931dc5d2f
Change-Id: I1866dd1f0f44dd6653c1d8c9618f04386a172888
Michael Plass [Wed, 29 Mar 2017 23:57:32 +0000 (23:57 +0000)]
Merge "Remove implementation of bssid hotlist"
am:
62c5f64fa5
Change-Id: I3744706b984da6ed123a4eea08312c75806adb8f
Nathan Harold [Wed, 29 Mar 2017 23:56:06 +0000 (23:56 +0000)]
Merge commit '
ce073d70bedc' into stage-aosp-master
am:
4fdc7d5ddd
Change-Id: I4bde8eedc986900096fc8429da2b195f907605c9
Robert Greenwalt [Wed, 29 Mar 2017 23:53:17 +0000 (23:53 +0000)]
Merge "Correct ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS" into oc-dev
Treehugger Robot [Wed, 29 Mar 2017 23:50:01 +0000 (23:50 +0000)]
Merge "Remove implementation of bssid hotlist"
Chad Brubaker [Wed, 29 Mar 2017 23:40:03 +0000 (23:40 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev am:
84eecd2532
am:
ba18f8674e
Change-Id: I2ad78d3d0fb98a68c25647b29afd5ba9cd759b97
Makoto Onuki [Wed, 29 Mar 2017 23:38:58 +0000 (23:38 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev am:
6c3e92bbe9
am:
d76076a103
Change-Id: I4b529623ca5169e4f56efa9d9d23d55f9307a829
Aaron Whyte [Wed, 29 Mar 2017 23:34:16 +0000 (23:34 +0000)]
Merge "Split scroll factor into a 2d float."
Chad Brubaker [Wed, 29 Mar 2017 23:33:48 +0000 (23:33 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
am:
84eecd2532
Change-Id: Ib297fcfe2f6bff079a4325420bc8b62a5f29bd55
Makoto Onuki [Wed, 29 Mar 2017 23:32:54 +0000 (23:32 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
am:
6c3e92bbe9
Change-Id: I7f4a77fd3dd98955ad4f6e88b6471d72190a3977
TreeHugger Robot [Wed, 29 Mar 2017 23:25:54 +0000 (23:25 +0000)]
Merge "Expose ACCESSIBILITY_CAPTIONING_* to Instant Apps" into oc-dev
Tony Mak [Wed, 29 Mar 2017 23:24:58 +0000 (23:24 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev am:
fc1dd04b0b
am:
742d336461
Change-Id: I5b325c62cc442b1f94d0770ca9ac8100045211ad
TreeHugger Robot [Wed, 29 Mar 2017 23:24:38 +0000 (23:24 +0000)]
Merge "Mention <intent> can't have string resources." into oc-dev
Tony Mak [Wed, 29 Mar 2017 23:21:23 +0000 (23:21 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
am:
fc1dd04b0b
Change-Id: I69b3c9fed0cc52b7a500f05a2ca8cd9fe3d0cc36
TreeHugger Robot [Wed, 29 Mar 2017 23:12:38 +0000 (23:12 +0000)]
Merge "Whitelist ManagedProvisioning from bg check" into oc-dev
Nathan Harold [Wed, 29 Mar 2017 23:03:34 +0000 (16:03 -0700)]
Merge commit '
ce073d70bedc' into stage-aosp-master
Change-Id: I319034a5b77de5cf71de0e110bb17819fb907f1b
Pavlin Radoslavov [Wed, 29 Mar 2017 23:04:01 +0000 (23:04 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
am:
7035d9a920
Change-Id: I97a0ca52a8e1d2dbccb9ff2263eec62772358df6
Jason Monk [Wed, 29 Mar 2017 23:00:30 +0000 (23:00 +0000)]
Merge "Fix battery warning color lookup" into oc-dev am:
834c260e98
am:
cedc7dfc2e
Change-Id: I544b92f15cc490845b24e429354f45bec8b45bc4
Peter Qiu [Wed, 29 Mar 2017 22:59:34 +0000 (22:59 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev am:
f1cc8b82b3
am:
a5b0d84ea7
Change-Id: I8e4a22a715e07f47473465db9acdbf81aaba2b58
Android Build Merger (Role) [Wed, 29 Mar 2017 22:59:08 +0000 (22:59 +0000)]
Merge "Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561 am:
dfc1264eff" into oc-dev-plus-aosp
Pavlin Radoslavov [Fri, 24 Feb 2017 18:19:14 +0000 (10:19 -0800)]
Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).
Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug:
35873828
Change-Id: Ia82036ac33590a3a402b1f5a36102264d47a9029
(cherry picked from commit
61075105ca95a2389c23733bf72b5d49b0da4b28)
Pavlin Radoslavov [Wed, 29 Mar 2017 22:57:22 +0000 (22:57 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579 am:
25105f6561
am:
dfc1264eff
Change-Id: I09fd2e135ff0410b08ce197f98a4f58b14c9b7c6
Maurice Lam [Wed, 29 Mar 2017 22:56:52 +0000 (22:56 +0000)]
Merge "Add custom view support to Tiles"
Jason Monk [Wed, 29 Mar 2017 22:56:24 +0000 (22:56 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
am:
834c260e98
Change-Id: Ic29ab89382f4d44e0777d3440ebbe7581a367220
Peter Qiu [Wed, 29 Mar 2017 22:55:31 +0000 (22:55 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
am:
f1cc8b82b3
Change-Id: Id1e32596121a5aef347d6e9bc4c2402a22acc207
Pavlin Radoslavov [Wed, 29 Mar 2017 22:51:41 +0000 (22:51 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am:
3c7fce3579
am:
25105f6561
Change-Id: I67601df54e55171e3d559b71258d99ad1e0a8c5d
Treehugger Robot [Wed, 29 Mar 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add a Skeleton IpSecService"
TreeHugger Robot [Wed, 29 Mar 2017 22:50:28 +0000 (22:50 +0000)]
Merge "Fix battery warning color lookup" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 22:49:59 +0000 (22:49 +0000)]
Merge "wifi: add test for tracking Passpoint AP on devices with Passpoint disabled" into oc-dev
Pavlin Radoslavov [Wed, 29 Mar 2017 22:47:28 +0000 (22:47 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am:
3c7fce3579
Change-Id: Ic8483107e72a61e8b07f26f343e36254fe57cfd9
Treehugger Robot [Wed, 29 Mar 2017 22:41:13 +0000 (22:41 +0000)]
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
Bill Yi [Wed, 29 Mar 2017 22:41:14 +0000 (15:41 -0700)]
Import translations. DO NOT MERGE
Change-Id: If44ef7a09f2efa1aea4792fe2e938fcc86b7a7f0
Auto-generated-cl: translation import
Bill Yi [Wed, 29 Mar 2017 22:33:42 +0000 (15:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc9c65a5620b0a87e6c6b5bcaa14e78597099cc9
Auto-generated-cl: translation import
Yifan Hong [Wed, 29 Mar 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev am:
ee40a2652c
am:
fb3066af0a
Change-Id: Ie4c79ce58903456e745b579533fc84f4daf7fc78
Yifan Hong [Wed, 29 Mar 2017 22:24:52 +0000 (22:24 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
am:
ee40a2652c
Change-Id: I565135074b206a3ae6f1783f4de799b57593e7c6
TreeHugger Robot [Wed, 29 Mar 2017 22:20:28 +0000 (22:20 +0000)]
Merge "Add HidlSupport.java for utility methods for HIDL." into oc-dev
Evan Rosky [Wed, 15 Feb 2017 21:26:51 +0000 (13:26 -0800)]
Allow cluster navigation to jump into touchscreenBlocksFocus
Adds an exception to touchscreenBlocksFocus ViewGroups which
are also keyboardNavigationClusters. The behavior we want is
that cluster navigation can jump into touchscreenBlocksFocus
clusters but normal keyboard navigation can't. Once focus is
in a touchscreenBlocksFocus cluster; however, we allow focus
navigation to move freely within that cluster. It remains in
that cluster until a subsequent cluster navigation brings it
back out.
Adds back the touchscreenBlocksFocus attributes to Toolbar
and actionbar so that they behave like they did before.
Bug:
34363323
Test: Added CTS test. Verified desired behavior in a test app
Change-Id: I555bf5570b16a57f0d4c8a020ae509a1e1b33910
(cherry picked from commit
aee802f3bc3da699315a7040728e5483483099ff)
Evan Rosky [Fri, 17 Mar 2017 21:08:55 +0000 (14:08 -0700)]
Expose initial focus feature flag for testing
Bug:
34520588
Test: View_FocusHandlingTest
Change-Id: I7a20a6e9c57fc61bd2562307f4e7f8dee1979a40
(cherry picked from commit
9a0ea38671f1721b940e0a1ba94226d1ebae397d)
Kang Li [Tue, 14 Mar 2017 18:52:17 +0000 (11:52 -0700)]
Add a service to rank apps for ResolverActivity.
bug:
30982298
Test: manual - shared images in Camera, texts in Messenger, and webpages
in Chrome.
Change-Id: If335c269ca54145839ad8fd4b3f9b93a74b550f8
George Mount [Wed, 29 Mar 2017 14:13:03 +0000 (14:13 +0000)]
Make public getFragments() and onGetLayoutInflater() methods
Bug
34703669
Test: I846ef668e3dd7d664cfb56d2b9400467ba9b79f4
Change-Id: Ie202960ada86b25e964f98a639b5f5740c8fdb79
Phil Weaver [Wed, 29 Mar 2017 21:36:19 +0000 (21:36 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev am:
6f3bc05868
am:
d859a67fa9
Change-Id: I165b974d3994d33ed863660ae6222b861f7cc3e0
Phil Weaver [Wed, 29 Mar 2017 21:32:19 +0000 (21:32 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
am:
6f3bc05868
Change-Id: I1240a4c21d712d1c04793897c5c50ef93edfc618
TreeHugger Robot [Wed, 29 Mar 2017 21:25:02 +0000 (21:25 +0000)]
Merge "Move displaying mag bounds into surface transation" into oc-dev
Michael Plass [Mon, 27 Mar 2017 18:11:47 +0000 (11:11 -0700)]
Remove implementation of bssid hotlist
Test: Relevant unit tests pass
Bug:
30147676
Change-Id: I268907cc13ef21c0ba547722fe7c866ee4cdae5a
Daniel Nishi [Wed, 29 Mar 2017 21:13:04 +0000 (21:13 +0000)]
Merge "Add support for movies & tv apps querying."
Makoto Onuki [Fri, 24 Mar 2017 19:54:56 +0000 (12:54 -0700)]
Mention <intent> can't have string resources.
Test: build
Bug
34046756
Change-Id: I761b246d6aba5df4a836af3d0b3bef8f977be5ec
Jaekyun Seok [Wed, 29 Mar 2017 21:01:55 +0000 (21:01 +0000)]
Merge "Enable static RROs by default" into oc-dev am:
22ea35187f
am:
bfc81099f9
Change-Id: I1b033f8b5f28bbd253b80d7e116155e73ee4845c
Jaekyun Seok [Wed, 29 Mar 2017 20:58:12 +0000 (20:58 +0000)]
Merge "Enable static RROs by default" into oc-dev
am:
22ea35187f
Change-Id: I0a00621eb8cb54bd89c938539d8a2d7baee46833
Adam Lesinski [Wed, 29 Mar 2017 20:52:38 +0000 (13:52 -0700)]
AAPT2: Allow arbitrary entry names with aapt2 optimize
Presumably, the apps build fine for the developers, so just
feed the existing names through without validation. Validation
still exists when building an app from source.
Bug:
36051854
Change-Id: Idc64ee91b08dce67d3c28f3c5284a7afa1312df1
Test: run aapt2 optimize on the apks from b/
36051854 and build aapt2_tests
TreeHugger Robot [Wed, 29 Mar 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Revert "AOD: Wake up fully on gestures by default""
TreeHugger Robot [Wed, 29 Mar 2017 20:48:53 +0000 (20:48 +0000)]
Merge "Enable static RROs by default" into oc-dev
TreeHugger Robot [Wed, 29 Mar 2017 20:46:32 +0000 (20:46 +0000)]
Merge "AOD: prevent clicking shelf when dark"
Tony Mak [Wed, 29 Mar 2017 14:53:07 +0000 (15:53 +0100)]
Whitelist ManagedProvisioning from bg check
Notice that app put in this list is also exempted from doze.
Also, this only exempts us from the service restriction, but not the broadcast one.
Test: adb shell am make-uid-idle --user 0 com.android.managedprovisioning
&& adb shell am broadcast -a android.intent.action.PRE_BOOT_COMPLETED -n com.android.managedprovisioning/com.android.managedprovisioning.ota.PreBootListener
Observe there is no crash
Change-Id: Ic0a943a9b66c909a6727f9411af519a8c6cf0157
Fix:
36705375
Connor O'Brien [Wed, 29 Mar 2017 20:37:00 +0000 (20:37 +0000)]
Merge "Recover cleanly from power HAL service crashes"
Etan Cohen [Wed, 29 Mar 2017 20:31:37 +0000 (20:31 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev am:
2ce80c839e -s ours
am:
4e158866f8 -s ours
Change-Id: I4e056cfa17e44bcbbcc017208588effa398fa36f
Android Build Merger (Role) [Wed, 29 Mar 2017 20:29:36 +0000 (20:29 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration am:
f6d243b6be -s ours am:
0d72393b87 -s ours"
Etan Cohen [Wed, 29 Mar 2017 20:28:54 +0000 (20:28 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
am:
2ce80c839e -s ours
Change-Id: Ic63f823621d8570b08a281820b5ce82e483aca0f
Etan Cohen [Wed, 29 Mar 2017 20:28:22 +0000 (20:28 +0000)]
[AWARE] Remove Publish/Subscribe Count configuration am:
f6d243b6be -s ours
am:
0d72393b87 -s ours
Change-Id: If1aa1a96998bf1e55780a597dcb43280bc3832fb
TreeHugger Robot [Wed, 29 Mar 2017 20:27:51 +0000 (20:27 +0000)]
Merge "Add a Skeleton IpSecService"
Etan Cohen [Wed, 29 Mar 2017 20:22:03 +0000 (20:22 +0000)]
[AWARE] Remove Publish/Subscribe Count configuration
am:
f6d243b6be -s ours
Change-Id: I01b9ae8c2f06458ea6615abb5ce2c848675ed3f5
Etan Cohen [Wed, 29 Mar 2017 20:14:59 +0000 (20:14 +0000)]
Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev
Jason Monk [Wed, 29 Mar 2017 20:14:08 +0000 (20:14 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev am:
c463bed8db
am:
72626d2dc2
Change-Id: I53aee8573abab7d59db1eaaf9692e73a4374389d
Adam Lesinski [Wed, 29 Mar 2017 20:00:35 +0000 (13:00 -0700)]
AAPT2: Parse an ID encoded as a map
ID types should not be encoded as a map. AAPT and AAPT2 emit
IDs as boolean types.
Some apps exist that for some reason have their ID types encoded
as empty maps. This is the case only for the auto generated IDs
from enum values in <attr> tags.
Allow IDs as maps and ignore their content when processing an APK
for optimizing.
Also fixes an issue with expected size of the ResTable_package struct.
Bug:
35861796
Test: tested against the APK in b/
35861796
Change-Id: I29a19cd9777bb10bed6766cd42e35e50e098797b
Jason Monk [Wed, 29 Mar 2017 20:09:31 +0000 (20:09 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev
am:
c463bed8db
Change-Id: I647f7ddf075d436c727990d16f6035dcb8adc483
Oliver Woodman [Wed, 29 Mar 2017 20:09:20 +0000 (20:09 +0000)]
Merge "Avoid unnecessary object allocation in CryptoInfo.set"
Yifan Hong [Mon, 27 Mar 2017 20:02:34 +0000 (13:02 -0700)]
Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.
Bug:
36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
TreeHugger Robot [Wed, 29 Mar 2017 20:03:59 +0000 (20:03 +0000)]
Merge "Make sure TileServices get onTileRemoved on reset" into oc-dev