OSDN Git Service
Rubin Xu [Thu, 30 Mar 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Update ENSURE_VERIFY_APPS javadoc" into oc-dev
am:
bb621fd95c
Change-Id: Ibab963baf46b36329a8277369ca1bc92ac90b647
Abodunrinwa Toki [Thu, 30 Mar 2017 19:32:10 +0000 (19:32 +0000)]
Merge "TextClassificationManager API updates." into oc-dev
am:
dada7c0e71
Change-Id: Idcd8fd7413b4fd187b3ffa893250b33754f0e962
TreeHugger Robot [Thu, 30 Mar 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Update ENSURE_VERIFY_APPS javadoc" into oc-dev
Abodunrinwa Toki [Thu, 30 Mar 2017 19:27:10 +0000 (19:27 +0000)]
Merge "Hide TextClassifier.EntityType from the public API." into oc-dev
am:
7600925263
Change-Id: Id3cdfb650739e48c6ad168239834d46565835180
TreeHugger Robot [Thu, 30 Mar 2017 19:17:18 +0000 (19:17 +0000)]
Merge "TextClassificationManager API updates." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 19:15:12 +0000 (19:15 +0000)]
Merge "Hide TextClassifier.EntityType from the public API." into oc-dev
Fyodor Kupolov [Thu, 30 Mar 2017 19:08:09 +0000 (19:08 +0000)]
Merge "Do not hold locks when calling getAccounts" into oc-dev
am:
6a841cb88b
Change-Id: Ie1d66b8e3a6dd11ebdea7b67756b9bf12581d5b2
TreeHugger Robot [Thu, 30 Mar 2017 19:02:34 +0000 (19:02 +0000)]
Merge "Do not hold locks when calling getAccounts" into oc-dev
Tianjie Xu [Thu, 30 Mar 2017 18:32:06 +0000 (18:32 +0000)]
Merge "Merge "Report the temperature during an OTA update" am:
47c7e7f41a am:
022682a721 am:
998c554463" into oc-dev
am:
217ecd0729
Change-Id: Ic6365155a6958f758031a4156c03d5ba4d56ff11
Adam Lesinski [Thu, 30 Mar 2017 18:28:19 +0000 (18:28 +0000)]
Merge "BatteryStats: Clamp temperature to 0" into oc-dev
am:
2042770ea5
Change-Id: I4e4d74a37afc3cdc56c14989ff66eadd774c39b7
Tianjie Xu [Thu, 30 Mar 2017 18:28:05 +0000 (18:28 +0000)]
Merge "Merge "Report the temperature during an OTA update" am:
47c7e7f41a am:
022682a721 am:
998c554463" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 18:22:39 +0000 (18:22 +0000)]
Merge "BatteryStats: Clamp temperature to 0" into oc-dev
Rob Carr [Thu, 30 Mar 2017 18:12:13 +0000 (18:12 +0000)]
Merge "Change layer stack when moving displays." into oc-dev
am:
1a89073d8f
Change-Id: Iaf13f20739b163fb9e89a710460f89af949bbb92
Maurice Lam [Thu, 30 Mar 2017 18:11:07 +0000 (18:11 +0000)]
Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev
am:
257047b24b
Change-Id: I2c2efe34719c14cd3fc3ff55f91917a2141218d3
Rob Carr [Thu, 30 Mar 2017 18:05:16 +0000 (18:05 +0000)]
Merge "Change layer stack when moving displays." into oc-dev
Maurice Lam [Thu, 30 Mar 2017 18:04:19 +0000 (18:04 +0000)]
Merge "Make Notification.EXTRA_ALLOW_DURING_SETUP system API" into oc-dev
Diego Perez [Thu, 30 Mar 2017 17:52:39 +0000 (17:52 +0000)]
Merge "Fix fonts following
455f1bfc05" into oc-dev
am:
3b36051cb5
Change-Id: I802db3a0b82334bf214e2d887b3e7c83a39efdb4
TreeHugger Robot [Thu, 30 Mar 2017 17:39:21 +0000 (17:39 +0000)]
Merge "Fix fonts following
455f1bfc05" into oc-dev
Felipe Leme [Thu, 30 Mar 2017 17:29:31 +0000 (17:29 +0000)]
Merge "Simplified autofill() methods by returning void instead of boolean." into oc-dev
am:
3030442b89
Change-Id: I29fc1e973611a77241155b9aeadaba68123e7d02
TreeHugger Robot [Thu, 30 Mar 2017 17:21:26 +0000 (17:21 +0000)]
Merge "Simplified autofill() methods by returning void instead of boolean." into oc-dev
Chad Brubaker [Thu, 30 Mar 2017 17:12:03 +0000 (17:12 +0000)]
Merge "Track isolated process owners" into oc-dev
am:
cd181e63ff
Change-Id: Idb0582fb3572ffa8272207f56127a8d751a4a75d
Chad Brubaker [Thu, 30 Mar 2017 17:03:46 +0000 (17:03 +0000)]
Merge "Track isolated process owners" into oc-dev
Fyodor Kupolov [Thu, 30 Mar 2017 17:00:49 +0000 (10:00 -0700)]
Do not hold locks when calling getAccounts
Not only it may cause a deadlock, calling authenticator while holding
the lock is also error-prone.
Test: manual
Bug:
36770176
Change-Id: I6871ea88643fc3c178214685c038b2238329e881
Evan Rosky [Thu, 30 Mar 2017 17:00:27 +0000 (17:00 +0000)]
Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" into oc-dev
am:
f114667f2d
Change-Id: I75deead3b2767d19f25378c4f34ca31c87027cae
John Reck [Thu, 30 Mar 2017 16:57:51 +0000 (16:57 +0000)]
Merge "Switch libplatformproto to sharedlib" into oc-dev
am:
72c2760943
Change-Id: I534c8d890499dbd7fbe456fa407b10e34d2a5eb3
Robin Lee [Thu, 30 Mar 2017 16:49:53 +0000 (16:49 +0000)]
Merge "resolve merge conflicts of
943187668c44 to oc-dev-plus-aosp" into oc-dev-plus-aosp
Evan Rosky [Thu, 30 Mar 2017 16:46:22 +0000 (16:46 +0000)]
Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 16:42:31 +0000 (16:42 +0000)]
Merge "Switch libplatformproto to sharedlib" into oc-dev
Robin Lee [Thu, 30 Mar 2017 16:39:56 +0000 (17:39 +0100)]
resolve merge conflicts of
943187668c44 to oc-dev-plus-aosp
Test: make -j30
Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Change-Id: Ib87cdb96626cd7625e15bec5e4afab12920405e9
Nicolas Geoffray [Thu, 30 Mar 2017 16:39:04 +0000 (16:39 +0000)]
Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev
am:
8d68694951
Change-Id: I5f6f30f0cf894577cf96dfd4d569b9785e48f493
George Mount [Thu, 30 Mar 2017 16:33:35 +0000 (16:33 +0000)]
Merge "Fix getting wrong instance when restoring non-config" into oc-dev
am:
8386603230
Change-Id: I7ee0bb17c62ec2a40c4f2e168f88296b7bc86989
Nicolas Geoffray [Thu, 30 Mar 2017 16:32:35 +0000 (16:32 +0000)]
Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev
TreeHugger Robot [Thu, 30 Mar 2017 16:27:36 +0000 (16:27 +0000)]
Merge "Fix getting wrong instance when restoring non-config" into oc-dev
Geoffrey Pitsch [Thu, 30 Mar 2017 16:18:03 +0000 (16:18 +0000)]
Merge "Wait to unlock before changing notification importance" into oc-dev
am:
a07ce03d3c
Change-Id: I243682f02fe2c5de131e8aaed4dd2a499cc3f8e1
TreeHugger Robot [Thu, 30 Mar 2017 16:13:59 +0000 (16:13 +0000)]
Merge "Wait to unlock before changing notification importance" into oc-dev
Robin Lee [Thu, 30 Mar 2017 16:12:34 +0000 (16:12 +0000)]
Merge "Move some VPN logic out of ConnectivityService" am:
ec86462033
am:
e61a30f635
Change-Id: I00ab618139fdeba2374021657d84de4827ed97a2
Robin Lee [Thu, 30 Mar 2017 16:08:50 +0000 (16:08 +0000)]
Merge "Move some VPN logic out of ConnectivityService"
am:
ec86462033
Change-Id: I212c2d6de1676ab65e6bbf34148d66e183d60c62
Robin Lee [Thu, 30 Mar 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Move some VPN logic out of ConnectivityService"
Abodunrinwa Toki [Wed, 29 Mar 2017 20:51:45 +0000 (21:51 +0100)]
Hide TextClassifier.EntityType from the public API.
Test: current.txt and friends updated correctly.
Bug:
35959173
Change-Id: I74011020a4e509bad98b94738d2e929fc068d9ae
Rubin Xu [Thu, 16 Mar 2017 18:02:57 +0000 (18:02 +0000)]
Update ENSURE_VERIFY_APPS javadoc
Make it clear that now this restriction applies across the whole device,
and is settable by profile owner.
Bug:
31000521
Test: None; just javadoc update
Change-Id: If82d8f4167cf1b77d6e10554f1d96b2d3a2a54a0
Diego Perez [Wed, 29 Mar 2017 11:29:58 +0000 (12:29 +0100)]
Fix fonts following
455f1bfc05
Test: Fixes broken tests
Change-Id: I62d001c6d0ed84fe1d1d9865b1027be0e1cad8b4
(cherry picked from commit
de5a95d42c9e5f4fbcf0064ae8eaa33ab5747637)
Makoto Onuki [Thu, 30 Mar 2017 15:23:56 +0000 (15:23 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev
am:
2692dafa9b
Change-Id: Id0b7b4fe09fe9165c9746b7906ce2247a59b7720
Makoto Onuki [Thu, 30 Mar 2017 15:18:25 +0000 (15:18 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev
Nicolas Geoffray [Thu, 30 Mar 2017 14:01:36 +0000 (14:01 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev
am:
f451f7b05b
Change-Id: I9b0063311a73f363c63501a96916e5b8c6f0f0e6
Geoffrey Pitsch [Wed, 29 Mar 2017 17:39:10 +0000 (13:39 -0400)]
Wait to unlock before changing notification importance
Test: runtest systemui
Change-Id: I66614de96e0a5c725ac6f6e7b76f64b39326ba6b
Fixes:
36264464
Nicolas Geoffray [Sun, 26 Mar 2017 13:09:04 +0000 (14:09 +0100)]
Drop REASON_NON_SYSTEM_LIBRARY.
Dexopt them with the same "mode" as the apk we are
going to dexopt. Because we treat them as shared, this
means they are only going to be fully compiled once an app
that has it in its <uses-library> gets compiled.
bug:
33799337
Test: m -j32 && boot
Change-Id: Ic93fbcf45be6b9cf31ad3a3eb498f9fbbefeb288
(cherry picked from commit
90978b4159dd1394c0643ae8171d24668fbc27a4)
Nicolas Geoffray [Thu, 30 Mar 2017 13:54:29 +0000 (13:54 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev
Diego Perez [Thu, 30 Mar 2017 13:30:17 +0000 (13:30 +0000)]
Merge "Handle the case where no session exists" into oc-dev
am:
261dd2305a
Change-Id: I36b6b77759b8bbfbccfd0801daccb8d4e0137a77
TreeHugger Robot [Thu, 30 Mar 2017 13:26:55 +0000 (13:26 +0000)]
Merge "Handle the case where no session exists" into oc-dev
Diego Perez [Thu, 30 Mar 2017 13:17:29 +0000 (13:17 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
am:
3134462c5e
Change-Id: I1d522836d59f02c96ca96e74c0891c6763ef75d4
Abodunrinwa Toki [Wed, 29 Mar 2017 21:41:57 +0000 (22:41 +0100)]
TextClassificationManager API updates.
- Changes getDefaultTextClassifier to getTextClassifier
- Adds a setTextClassifier API
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t
android.widget.cts.TextViewTest
Bug:
35763797
Change-Id: I24e86272cf58bf6864505bee3b06978c1c0d46e5
Diego Perez [Thu, 30 Mar 2017 13:12:34 +0000 (13:12 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev
Nicolas Geoffray [Fri, 24 Mar 2017 15:13:38 +0000 (15:13 +0000)]
Drop REASON_CORE_APP.
After ensuring apps used by system server are speed compiled
on /system, we don't need a special reason anymore.
bug:
36532541
bug:
33799337
Test: m -j32 && boot
Change-Id: I1fb894f0f5b796cb9d59ed01a4afb2709c0f5496
(cherry picked from commit
b70e4bfe0776a3446ccfddd5a10b1ff155f60e34)
Wale Ogunwale [Thu, 30 Mar 2017 11:30:19 +0000 (11:30 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev
am:
921daeed2f
Change-Id: I37f36e68ea0ebf2e462ecffba8ddf03ee13940e5
TreeHugger Robot [Thu, 30 Mar 2017 11:25:03 +0000 (11:25 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev
Diego Perez [Mon, 27 Mar 2017 14:14:45 +0000 (15:14 +0100)]
Handle the case where no session exists
In some cases, if an error happens, no session will exist in
BridgeRenderSession.
Test: Added small regression test
Change-Id: Ic9be381767626766395c65044542c197ed7649e7
Diego Perez [Wed, 29 Mar 2017 16:20:01 +0000 (17:20 +0100)]
Make layoutlib more lenient with recoverable errors
In many cases, throwing an exception will stop the inflation or
rendering of a layout. Sometimes, we could recover from some of the
failures and render a layout that is "usable".
I've done a first pass trying to follow the following rules:
- Try simple recoveries by choosing sensible defaults. Not trying
complex recoveries.
- Only recover if the exception is not part of the class behaviour.
Avoided removing declared exceptions or exceptions that are expected by
the framework.
- I've kept assertions in place so, in most cases, the behaviour will
be almost identical to the previous one with assertions enabled.
Test: Checked with existing tests
Change-Id: I0001fdd3c808cf405c4eb8d734b9bbe63493e05c
Sudheer Shanka [Thu, 30 Mar 2017 07:43:32 +0000 (07:43 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
am:
8c85b1d0b7
Change-Id: Ic36c9e2220e3d8b3fca408067e0c0cfa1eb99f45
Sudheer Shanka [Thu, 30 Mar 2017 07:38:05 +0000 (07:38 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev
Nathan Harold [Thu, 30 Mar 2017 03:48:20 +0000 (03:48 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971 am:
6d3c10495e
am:
81d48a99e0
Change-Id: I941ee00099df0afdbce94b73c1bd81c246fac1e8
Sudheer Shanka [Thu, 30 Mar 2017 03:46:30 +0000 (20:46 -0700)]
Fix flaky tests in NetworkPolicyManagerServiceTest.
Test: runtest -c com.android.server.NetworkPolicyManagerServiceTest frameworks-services
Change-Id: I0a6f0d11e3922bfeb2bd3784f23e10ae45e5e40c
Nathan Harold [Thu, 30 Mar 2017 03:44:12 +0000 (03:44 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971
am:
6d3c10495e
Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10
Nathan Harold [Thu, 30 Mar 2017 03:39:46 +0000 (03:39 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
am:
d118826971
Change-Id: Ie59322c4e80aab89d784a2fcb3edd6458677bbb7
Jakub Pawlowski [Thu, 30 Mar 2017 03:35:53 +0000 (03:35 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15 am:
c06722e788
am:
c809a5b12b
Change-Id: I218f37b60aa5cfd4c427663b83807ffce2cfa11b
Treehugger Robot [Thu, 30 Mar 2017 03:33:12 +0000 (03:33 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress"
Jakub Pawlowski [Thu, 30 Mar 2017 03:30:42 +0000 (03:30 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15
am:
c06722e788
Change-Id: Ie0f3b4d162bec0a501f56f2324fec1c7d2ccbda7
Jakub Pawlowski [Thu, 30 Mar 2017 03:26:18 +0000 (03:26 +0000)]
Merge "Hide periodic scanning"
am:
ca7544ea15
Change-Id: Icedae1d34de063d6b708a30bdc6217d48ed373ef
Jakub Pawlowski [Thu, 30 Mar 2017 03:17:48 +0000 (03:17 +0000)]
Merge "Hide periodic scanning"
Michael Plass [Thu, 30 Mar 2017 03:05:12 +0000 (03:05 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
am:
859789061f
Change-Id: I7e04832c58e9a42485cbd844d2cd741a8091cce2
TreeHugger Robot [Thu, 30 Mar 2017 02:58:35 +0000 (02:58 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev
Adam Lesinski [Thu, 30 Mar 2017 02:29:00 +0000 (19:29 -0700)]
BatteryStats: Clamp temperature to 0
Temperature is encoded without the sign-bit, meaning
negative temperatures cause an underflow and show up
in the history as large values. We do not expect to
deal with negative temperatures for debugging/diagnostics
so just clamp the temperature to 0.
Bug:
33270828
Test: adb shell dumpsys battery set temp -10 && adb shell dumpsys batterystats --history
Change-Id: I8a92f770e4a90333eade1bb38f21d2d87bb00430
Ta-wei Yen [Thu, 30 Mar 2017 01:58:40 +0000 (01:58 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
am:
dfbc8517ee
Change-Id: I346365749cc6309cb1f2905f91ea9bac143519f0
TreeHugger Robot [Thu, 30 Mar 2017 01:51:51 +0000 (01:51 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev
Romain Guy [Thu, 30 Mar 2017 01:48:42 +0000 (01:48 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
am:
33813bd439
Change-Id: I5862310360b3532b5c59eda6bae95e8922e0bb08
Romain Guy [Thu, 30 Mar 2017 01:42:25 +0000 (01:42 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev
John Reck [Thu, 30 Mar 2017 01:41:27 +0000 (18:41 -0700)]
Switch libplatformproto to sharedlib
libplatformprotos is really really unhappy if it gets
loaded twice into the same process which trivially happens
if it's a static library. Switch it to a shared library
instead to fix this.
Change-Id: I90297d076d0739bab683fbd9607d7fc0884a002d
Fixes:
36272398
Test: Ran hwui_unit_test, didn't crash
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
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
Felipe Leme [Thu, 30 Mar 2017 00:47:58 +0000 (17:47 -0700)]
Simplified autofill() methods by returning void instead of boolean.
Test: CtsAutoFillServiceTestCases pass
Change-Id: Ic94e6686e291fed60ef6715bd160f9b568bf0ea6
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
Nathan Harold [Wed, 29 Mar 2017 17:47:59 +0000 (10:47 -0700)]
Change reserveSecurityParameterIndex() to take a remoteAddress
To make the SPI reservation more semantically consistent with the
transform creation API, and to ensure that we always create SPI
reservations relative to a well-known remote, we should take the
SPI request relative to a remote (rather than to a destination).
This necessitates that we now consider direction separately, which
is used for keying the SA-Id.
Bug:
36073210
Test: compilation
Change-Id: I81e955c20128c1f8e04fd68eb26669561f827a78
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: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
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
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
Jakub Pawlowski [Thu, 30 Mar 2017 00:00:44 +0000 (17:00 -0700)]
Hide periodic scanning
Bug:
30622771
Test: manual
Change-Id: I5d786b13cf99287732e16769e2563ac7c4fe715c
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 Carr [Wed, 29 Mar 2017 22:52:23 +0000 (15:52 -0700)]
Change layer stack when moving displays.
Previously we only change layer stack when creating a new surface.
This isn't enough for moving existing activities between displays.
Test: Try moving existing activity to new display.
Bug:
36002411
Change-Id: I536f26cba43fc4fd1b60c8b504355076e2fb162e
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