OSDN Git Service
Chad Brubaker [Thu, 30 Mar 2017 17:37:45 +0000 (17:37 +0000)]
Merge "Track isolated process owners" into oc-dev am:
cd181e63ff
am:
5cde044596
Change-Id: Icfa2e715ce8341b511364ccadf66955bebdb9e81
Evan Rosky [Thu, 30 Mar 2017 17:34:09 +0000 (17:34 +0000)]
Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" into oc-dev am:
f114667f2d
am:
2c449964f8
Change-Id: I0185194f2f25c475162039b0ffdcb58525a39ea8
John Reck [Thu, 30 Mar 2017 17:32:00 +0000 (17:32 +0000)]
Merge "Switch libplatformproto to sharedlib" into oc-dev am:
72c2760943
am:
af39ba5d49
Change-Id: I73d9035f13f83c80045004867b4470779095d603
Robin Lee [Thu, 30 Mar 2017 17:31:05 +0000 (17:31 +0000)]
Merge "resolve merge conflicts of
943187668c44 to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
1f3f5955bb
Change-Id: Iab71657e2f95658aa4b87beb273cd65b473d6871
Nicolas Geoffray [Thu, 30 Mar 2017 17:29:45 +0000 (17:29 +0000)]
Merge "Drop REASON_NON_SYSTEM_LIBRARY." into oc-dev am:
8d68694951
am:
3d02cf4c21 -s ours
Change-Id: I46842c118e553884eec6e05abf05266a4e60ad3c
TreeHugger Robot [Thu, 30 Mar 2017 17:27:09 +0000 (17:27 +0000)]
Merge "Fix PackageManagerService passing usesLibraryFiles to dexOpt."
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
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:39:03 +0000 (16:39 +0000)]
Merge "Fix getting wrong instance when restoring non-config" into oc-dev am:
8386603230
am:
be99bf2cd4
Change-Id: I5d6ff3492ab51b530480bfbf3b5856d3281cb183
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:23:23 +0000 (16:23 +0000)]
Merge "Wait to unlock before changing notification importance" into oc-dev am:
a07ce03d3c
am:
8637cbeac5
Change-Id: Ia92eb68026a23d584563c45d94610ea456d27476
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
Tomasz Wasilczyk [Thu, 30 Mar 2017 16:08:25 +0000 (16:08 +0000)]
Merge "Add analog force mode for analog/digital hybrid modes."
Robin Lee [Thu, 30 Mar 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Move some VPN logic out of ConnectivityService"
Makoto Onuki [Thu, 30 Mar 2017 15:27:53 +0000 (15:27 +0000)]
Merge "Show user running state in dumpsys user." into oc-dev am:
2692dafa9b
am:
60e6e538f9
Change-Id: Id37b0c99f10a2b6f9506778f600e3f98a234099c
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
TreeHugger Robot [Thu, 30 Mar 2017 15:14:49 +0000 (15:14 +0000)]
Merge "Add comments to clarify how SkDrawable dtor is called"
Nicolas Geoffray [Thu, 30 Mar 2017 14:08:49 +0000 (14:08 +0000)]
Merge "Drop REASON_CORE_APP." into oc-dev am:
f451f7b05b
am:
31f7a2859b -s ours
Change-Id: Ice5c6b065d580e55ff2e6b8d9a670da4cb3a0c8c
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:34:57 +0000 (13:34 +0000)]
Merge "Handle the case where no session exists" into oc-dev am:
261dd2305a
am:
cd190037af
Change-Id: Ic5271f342f90b5b4d5057bffe38def7a4a107b96
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:21:51 +0000 (13:21 +0000)]
Merge "Make layoutlib more lenient with recoverable errors" into oc-dev am:
3134462c5e
am:
510916c13f
Change-Id: I3c02fde71a2fc7b955b9ad124fe81eccf5a983a3
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
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)
Nicolas Geoffray [Sun, 26 Mar 2017 13:31:34 +0000 (14:31 +0100)]
Drop REASON_SHARED_APK.
This reason was only used by "system shared libraries", not shared
APKs like GMS.
Code that uses this reason is now obsolete, as we do compile these shared
libraries when we see an apk that uses it.
bug:
33799337
Test: m -j32 && boot
Change-Id: I2eef22797551401a5c39ed339bc2486cf0d091a8
Nicolas Geoffray [Thu, 30 Mar 2017 11:53:28 +0000 (11:53 +0000)]
Merge changes Ic93fbcf4,I1fb894f0
* changes:
Drop REASON_NON_SYSTEM_LIBRARY.
Drop REASON_CORE_APP.
Wale Ogunwale [Thu, 30 Mar 2017 11:34:08 +0000 (11:34 +0000)]
Merge "Correctly blame ANR on process using another process token" into oc-dev am:
921daeed2f
am:
860732e495
Change-Id: Ic249da944216aae8a6582b9d5d4648c4d9ea83b4
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:47:55 +0000 (07:47 +0000)]
Merge "Fix flaky tests in NetworkPolicyManagerServiceTest." into oc-dev am:
8c85b1d0b7
am:
abed833af1
Change-Id: I2dc30715a2022eb6903b77643afae6eaa0ce3647
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:51:47 +0000 (03:51 +0000)]
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am:
d118826971 am:
6d3c10495e am:
81d48a99e0
am:
949d1353e9
Change-Id: I86d5e1c019336707f7d3f1102aaca52a91dea310
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:39:45 +0000 (03:39 +0000)]
Merge "Hide periodic scanning" am:
ca7544ea15 am:
c06722e788 am:
c809a5b12b
am:
f96f05b108
Change-Id: Ic65fa3ef68543405c1075c03079a4c5fa53ade4f
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:10:13 +0000 (03:10 +0000)]
Merge "Cherry-pick: Remove implementation of bssid hotlist" into oc-dev am:
859789061f
am:
1a322e7d14
Change-Id: Icee72301731c58f4babe121feb815de7c5fea557
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
Ta-wei Yen [Thu, 30 Mar 2017 02:05:06 +0000 (02:05 +0000)]
Merge "Rename ACTION_VOICEMAIL_SMS_RECEIVED" into oc-dev am:
dfbc8517ee
am:
904e1856a7
Change-Id: I2066d699def9e921df3a2fd12a709a01b5e7795a
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
Android Build Merger (Role) [Thu, 30 Mar 2017 01:56:00 +0000 (01:56 +0000)]
Merge "Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am:
33813bd439 am:
6869c55106"
TreeHugger Robot [Thu, 30 Mar 2017 01:55:05 +0000 (01:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Romain Guy [Thu, 30 Mar 2017 01:53:07 +0000 (01:53 +0000)]
Merge "Convert bitmaps to sRGB/scRGB when they have a color profile" into oc-dev am:
33813bd439
am:
6869c55106
Change-Id: I69b4e1ba160032255891fbb2656445badd5b936e
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
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
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
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
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
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
OSDN Git Service
