OSDN Git Service
Pankaj Kanwar [Wed, 6 Dec 2017 18:25:41 +0000 (18:25 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
am:
407809c911
Change-Id: If36f772a171b4c909878509cefc466bd09ffc142
Pankaj Kanwar [Wed, 6 Dec 2017 17:42:20 +0000 (17:42 +0000)]
Merge "[AWARE] Make PeerHandle comparable/hashable" into oc-mr1-dev
Wenting Xiong [Wed, 6 Dec 2017 16:32:09 +0000 (16:32 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off" am:
f845bbdfa4
am:
592f539419
Change-Id: I88d871f593ff64ebea1c36f42a8fe59d69d3b6f3
Wenting Xiong [Wed, 6 Dec 2017 16:21:34 +0000 (16:21 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
am:
f845bbdfa4
Change-Id: I3285f1f9e63cbf3d0487618b5ff636c7637ef9e4
Treehugger Robot [Wed, 6 Dec 2017 16:07:28 +0000 (16:07 +0000)]
Merge "SystemUI: Display RAT icon in quick setting when data is off"
kaichieh [Wed, 6 Dec 2017 10:21:48 +0000 (10:21 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java" am:
a0c52a8ace
am:
5f2f65239b
Change-Id: Ib09918bd84ae40701b30aebe31ef71ffeecdea7e
kaichieh [Wed, 6 Dec 2017 10:11:10 +0000 (10:11 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
am:
a0c52a8ace
Change-Id: I5cc7ab8916901e1b3622a17676debe023578f1eb
Treehugger Robot [Wed, 6 Dec 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"
ludi [Wed, 6 Dec 2017 03:49:56 +0000 (03:49 +0000)]
Merge "Cleanup of resource limit tests" am:
39f58678db
am:
da23b08c6c
Change-Id: I102693c752fb8fbaf9c1bac824047b5ed6d3d9c1
kyle_tso [Wed, 6 Dec 2017 03:42:11 +0000 (03:42 +0000)]
Merge "Support scanDirectories with JNI callback function" am:
5747c2b81c
am:
34be883ebd
Change-Id: I57a54d520cd953c7b99e6815e7894421166368d4
Venkata Jagadeesh [Wed, 6 Dec 2017 03:31:08 +0000 (03:31 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry" am:
d5410ca51b
am:
ca4e402e9b
Change-Id: Ieac7271cf0d1aaa75f3472685e745b55e006ba67
ludi [Wed, 6 Dec 2017 03:29:35 +0000 (03:29 +0000)]
Merge "Cleanup of resource limit tests"
am:
39f58678db
Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206
Chih-hung Hsieh [Wed, 6 Dec 2017 03:25:11 +0000 (03:25 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup" am:
d5dca64f72
am:
6fb084db88
Change-Id: I6d18cc00937896bb227fc1ba30bc6102f84029b3
kyle_tso [Wed, 6 Dec 2017 03:22:30 +0000 (03:22 +0000)]
Merge "Support scanDirectories with JNI callback function"
am:
5747c2b81c
Change-Id: I8996fb568c4024ccf76a5643049de8cee6f811c6
Venkata Jagadeesh [Wed, 6 Dec 2017 03:17:29 +0000 (03:17 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"
am:
d5410ca51b
Change-Id: Ibef0191ee1863e08ab73226d9e27cbdfa54face2
Chih-hung Hsieh [Wed, 6 Dec 2017 03:12:09 +0000 (03:12 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"
am:
d5dca64f72
Change-Id: Ic05b86f4bbff44e03298e823e9105c664b7ba1e0
Treehugger Robot [Wed, 6 Dec 2017 02:58:41 +0000 (02:58 +0000)]
Merge "Cleanup of resource limit tests"
Treehugger Robot [Wed, 6 Dec 2017 02:06:49 +0000 (02:06 +0000)]
Merge "Support scanDirectories with JNI callback function"
Treehugger Robot [Wed, 6 Dec 2017 00:48:40 +0000 (00:48 +0000)]
Merge "Don't remove bonding device from cached device list during inquiry"
Chih-hung Hsieh [Wed, 6 Dec 2017 00:25:20 +0000 (00:25 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"
Venkata Jagadeesh [Fri, 20 May 2016 07:38:35 +0000 (13:08 +0530)]
Don't remove bonding device from cached device list during inquiry
Use case: DUT unable to start auto connect after pairing to remote devices
Steps:
1. pair with remote device
2. unpair remote device.
3. Pair again to same remote from available devices list and initiate inquiry same time
Failure: DUT unable to start auto connect after pairing to remote device
Root Cause: As bonding device is removed from cached device list,a new cached device
entry is created after bonding with auto connection variable reset.
Fix: This issue fixed by deleting only non bonded and non bonding devices during inquiry.
Test: Tested with Beats Wireless
Bug:
35415106
Change-Id: I9d1c399292420fa2e321a4f6410e672a2abcc423
Wenting Xiong [Tue, 5 Dec 2017 05:16:34 +0000 (13:16 +0800)]
SystemUI: Display RAT icon in quick setting when data is off
Introduce implementation to display RAT icon in quick setting
even when data is off.
Test: Test with simulated RIL
Bug:
28805511
Change-Id: I7fabec993c22e3359e36cff2caca9258d79f6273
Chih-Hung Hsieh [Tue, 5 Dec 2017 17:56:46 +0000 (09:56 -0800)]
Use -Werror in frameworks/base/tests/backup
* Ommit unused parameter names.
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: Ie073fd911480960673b24d5b4d84b4f8dd0d0302
Hugo Benichi [Tue, 5 Dec 2017 10:01:19 +0000 (10:01 +0000)]
Merge "Fix bug in MacAddress.fromString()" am:
cdb84d2fc7
am:
9d077ecd9d
Change-Id: If67d0b8fcc2270d4b152d4e07c79725b457574c6
Hugo Benichi [Tue, 5 Dec 2017 09:47:50 +0000 (09:47 +0000)]
Merge "Fix bug in MacAddress.fromString()"
am:
cdb84d2fc7
Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df
Treehugger Robot [Tue, 5 Dec 2017 09:38:42 +0000 (09:38 +0000)]
Merge "Fix bug in MacAddress.fromString()"
Colin Cross [Tue, 5 Dec 2017 05:42:40 +0000 (05:42 +0000)]
Merge "Don't use path to find protoc-gen-javastream" am:
1a2a45667b
am:
1c578e8032
Change-Id: I87059bcfa09597449aaef2e2141957ea7d181ce5
Colin Cross [Tue, 5 Dec 2017 05:33:47 +0000 (05:33 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
am:
1a2a45667b
Change-Id: Idf4e12d812cf9108f8c3b22057e0bcbd90c14807
Treehugger Robot [Tue, 5 Dec 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Don't use path to find protoc-gen-javastream"
Hugo Benichi [Tue, 5 Dec 2017 04:14:08 +0000 (13:14 +0900)]
Fix bug in MacAddress.fromString()
Test: runtest frameworks-net
Bug:
69390696
Change-Id: I83f01e4915092e08ed201d9b6738bb02498d3bba
Andreas Gampe [Tue, 5 Dec 2017 02:43:53 +0000 (02:43 +0000)]
Merge "Frameworks: Silently ignore InterruptedException" am:
7e717e09cd
am:
a6c6c4f5d3
Change-Id: I737474738fa688d5bc651390409cbd792ffa7282
nharold [Tue, 5 Dec 2017 02:37:14 +0000 (02:37 +0000)]
Merge "Validate IpSecAlgorithm Length" am:
68b81299d2
am:
5e3d66e78b
Change-Id: I1ffaa4de392777c5199a411aef9cd10f4e7c3666
Andreas Gampe [Tue, 5 Dec 2017 02:34:41 +0000 (02:34 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
am:
7e717e09cd
Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2
nharold [Tue, 5 Dec 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Validate IpSecAlgorithm Length"
am:
68b81299d2
Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da
Treehugger Robot [Tue, 5 Dec 2017 02:25:14 +0000 (02:25 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
nharold [Tue, 5 Dec 2017 02:13:55 +0000 (02:13 +0000)]
Merge "Validate IpSecAlgorithm Length"
Colin Cross [Tue, 5 Dec 2017 01:39:47 +0000 (01:39 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path" am:
85f095e246
am:
b42cfb691d
Change-Id: I8af7eee810e05ba6ba7d42cdddc6efee8963b141
Colin Cross [Tue, 5 Dec 2017 01:29:12 +0000 (01:29 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
am:
85f095e246
Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7
Jeff Sharkey [Tue, 5 Dec 2017 01:28:55 +0000 (01:28 +0000)]
Merge "Match network roaming state to avoid wtf()." am:
3fb2711ede
am:
bafba08c6b
Change-Id: I3dd62df8b9bb89936c1c722849bfa921bc8b3e6d
Jeff Sharkey [Tue, 5 Dec 2017 01:11:53 +0000 (01:11 +0000)]
Merge "Match network roaming state to avoid wtf()."
am:
3fb2711ede
Change-Id: I6796d37e4458ef4da16d16f4c0f2bdd495007515
Colin Cross [Tue, 5 Dec 2017 00:02:10 +0000 (16:02 -0800)]
Don't use path to find protoc-gen-javastream
Previous attempts to use a full path in the --plugin argument
failed, but that was because the --plugin argument had the wrong
name (protoc-gen-java-stream instead of protoc-gen-javastream)
and was being completely ignored. Passing a full path where
the last element of the path is protoc-gen-javastream works fine.
Fixes issues where the command line is expanded with $PATH in
it 58 times which could hit command length limits if $PATH was
even a little bit larger than the default.
Test: m framework
Change-Id: Icd336f522fb8770d9058d18d8a04d24a96405615
Colin Cross [Tue, 5 Dec 2017 01:08:41 +0000 (01:08 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Mon, 4 Dec 2017 21:45:19 +0000 (13:45 -0800)]
Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH). They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).
Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.
Bug:
70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit
bd200ce7d4ebe31ad4327683e59af269420b0ef5)
Jeff Sharkey [Tue, 5 Dec 2017 00:58:46 +0000 (00:58 +0000)]
Merge "Match network roaming state to avoid wtf()."
Colin Cross [Tue, 5 Dec 2017 00:34:32 +0000 (00:34 +0000)]
Merge "Remove unused AIDL files" am:
d0abc863f4
am:
43f665c95e
Change-Id: I3d966c647103c45f8a078adcb4260c08174cf61c
Jordan Liu [Tue, 5 Dec 2017 00:26:44 +0000 (00:26 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config" am:
febd180254
am:
516b41e5a5
Change-Id: I8b4c01595374604cd2a076f184e25531e63ed4bf
Colin Cross [Tue, 5 Dec 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am:
d0abc863f4
Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
Hugo Benichi [Mon, 4 Dec 2017 23:51:41 +0000 (23:51 +0000)]
Merge "MacAddress: light refactors and improve documentation" am:
d871cab32d
am:
2f7cb5752b
Change-Id: I1e9948225e7c5ad64fad2e596d03deb3524c411c
Jordan Liu [Mon, 4 Dec 2017 23:44:36 +0000 (23:44 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
am:
febd180254
Change-Id: Iff2bf2fa0132692b3164d5543cfd20cd1d153ede
Hugo Benichi [Mon, 4 Dec 2017 23:38:27 +0000 (23:38 +0000)]
Merge "MacAddress: light refactors and improve documentation"
am:
d871cab32d
Change-Id: I51bb8786ecd7f53e3342625c7a2625007eedfc0f
Treehugger Robot [Mon, 4 Dec 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Remove unused AIDL files"
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"
Nathan Harold [Fri, 10 Nov 2017 00:49:33 +0000 (16:49 -0800)]
Validate IpSecAlgorithm Length
Improve the Validation of IpSecAlgorithm by
explicitly checking the length in addition to
the truncation length (previously an oversight).
In addition, we now check the lengths during
un-parceling, which will catch someone maliciously
manually building a parcel and passing it, bypassing
the checks in the constructor.
Bug:
68780091
Test: runtest -x IpSecAlgorithmTest.java
Change-Id: I8172762617264d34f47d5144336464510f07a701
Treehugger Robot [Mon, 4 Dec 2017 23:01:11 +0000 (23:01 +0000)]
Merge "MacAddress: light refactors and improve documentation"
Andreas Gampe [Mon, 4 Dec 2017 22:42:03 +0000 (14:42 -0800)]
Frameworks: Silently ignore InterruptedException
Apps seem to rely on this undocumented behavior so that the
threaded sync adapter doesn't crash an app. That's really
bad on the app side, but we will have to live with it.
Bug:
67986472
Bug:
70122540
Test: m
Test: Device boots
Test: m cts && cts-tradefed run commandAndExit cts-dev --module CtsContentTestCases -c android.content.cts.SharedPreferencesTest
Change-Id: I1ee4dfba4ad29c4f66fa60d3c8f8a99900b3447a
Jeff Sharkey [Mon, 4 Dec 2017 22:52:01 +0000 (15:52 -0700)]
Match network roaming state to avoid wtf().
Test: sure
Bug:
70174865
Change-Id: I02faef05e3fb918c3c023fb2fdd1886d45cc8c71
Exempt-From-Owner-Approval: P0 bug
Ying Xu [Mon, 4 Dec 2017 22:43:44 +0000 (22:43 +0000)]
Merge "Convert ICarrierService to oneway." am:
a9494954d9 -s ours
am:
be36500948 -s ours
Change-Id: Iaaf170a63f97d00275bd55fa6f499f757ae98961
Ying Xu [Mon, 4 Dec 2017 22:27:57 +0000 (22:27 +0000)]
Merge "Convert ICarrierService to oneway."
am:
a9494954d9 -s ours
Change-Id: Ie385d36ff924adb152c36982ca11d741af44b48f
Ying Xu [Mon, 4 Dec 2017 22:11:36 +0000 (22:11 +0000)]
Merge "Convert ICarrierService to oneway."
Colin Cross [Mon, 4 Dec 2017 19:21:53 +0000 (19:21 +0000)]
Merge "Convert framework.jar to Android.bp" am:
3d16ff7a4a -s ours
am:
910fbf6562 -s ours
Change-Id: I1105bd02d2f5be3676b1eb32d3de5e3ac010163b
Colin Cross [Thu, 30 Nov 2017 22:29:34 +0000 (14:29 -0800)]
Remove unused AIDL files
These files show up in a glob for all AIDL files, but are not listed
in AIDL files to be built, and have no references in codesearch
except for one unused import.
Bug:
70046217
Test: m checkbuild
Change-Id: I7d6a3bb19d2e16b5f09473f3058afcf5b4edd9b6
Colin Cross [Mon, 4 Dec 2017 19:05:46 +0000 (19:05 +0000)]
Merge "Convert framework.jar to Android.bp"
am:
3d16ff7a4a -s ours
Change-Id: I0652992a85c11b8be5f5b7428382bc3653c0e2a3
Colin Cross [Mon, 4 Dec 2017 18:55:24 +0000 (18:55 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master
am:
05126403db
Change-Id: I3d4ad90aff8415aeaf44d13805dd1267151f17d4
Colin Cross [Mon, 4 Dec 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Convert framework.jar to Android.bp"
Colin Cross [Mon, 4 Dec 2017 18:43:35 +0000 (18:43 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master
Jonathan Basseri [Tue, 25 Jul 2017 20:34:36 +0000 (13:34 -0700)]
Convert ICarrierService to oneway.
Change the carrier config AIDL used by CarrierService to a oneway call.
This is the IPC used to fetch carrier config bundles from carrier apps.
Converting to oneway allows CarrierConfigLoader to be non-blocking while
it fetches config.
Bug:
63176442
Test: runtest carrierconfig-unit & manual
(cherry picked from commit
49b54d64ca5c2aa08021c2ad747597cdd4486ad8)
Merged-in: Iceaf0446321f719011f67897398da7d5998c5fc7
Change-Id: I436f6c920f68f8bbc0fd66a5ff10676ed1529383
Rubin Xu [Mon, 4 Dec 2017 17:18:18 +0000 (17:18 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev am:
59f44d34c6
am:
92609c7db1
Change-Id: Ib0f01cb899121d2e0cf0e3c3270f9c453be69013
Rubin Xu [Mon, 4 Dec 2017 17:07:19 +0000 (17:07 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
am:
59f44d34c6
Change-Id: I7afc27da73c5a54537fcd8f49128752e00a954ea
Etan Cohen [Mon, 4 Dec 2017 15:53:31 +0000 (07:53 -0800)]
[AWARE] Make PeerHandle comparable/hashable
Add public equals()/hash() methods to PeerHandle. Allows the handle to
be used across multiple calls/sessions.
(partial cherry-pick of commit
3d33d7495ffbf12966299df8359d71a6f0926e7a)
(cherry-pick of commit
0d49c0dda8bfef0267d81e8490e4882e51a15af4)
Bug:
68931709
Test: builds, unit test, integration test
Change-Id: I87df50edb948a7afc90e496165013235ddca1e48
Merged-In: Idc59269d4275181ed6d9a793213c681dc4e98134
Merged-In: I6848acda9bfef306b8feaae6987ff18f7bc2e6ec
Evan Laird [Mon, 4 Dec 2017 15:04:39 +0000 (15:04 +0000)]
Merge "SystemUI: Display RAT icon when data is off" am:
e441298a11
am:
1fed537674
Change-Id: I32a4c932a9abdacd1fd43a34b650a88377b1ed07
Evan Laird [Mon, 4 Dec 2017 14:50:15 +0000 (14:50 +0000)]
Merge "SystemUI: Display RAT icon when data is off"
am:
e441298a11
Change-Id: I483d17ac1ef79b9b6f31bbefaf03f7833e13020b
Evan Laird [Mon, 4 Dec 2017 14:37:16 +0000 (14:37 +0000)]
Merge "SystemUI: Display RAT icon when data is off"
Hugo Benichi [Thu, 16 Nov 2017 05:40:16 +0000 (14:40 +0900)]
MacAddress: light refactors and improve documentation
This patch does some light refactoring in MacAddress to prepare for
exposing MacAddress in the public api:
- documention is improved
- some method names are renamed
- a toSafeString method is added
- a padding bug in the conversion methods outputting strings for
mac addresses is fixed
Bug:
69390696
Test: runtest frameworks-net
Change-Id: I399a97dabc2dfa8df9c5518c8b12484e43ca05c9
Rubin Xu [Mon, 4 Dec 2017 11:32:48 +0000 (11:32 +0000)]
resolve merge conflicts of
2ff6320d773c to oc-dr1-dev
Change-Id: I3711119a6cbba1b697ad379a8520b73023c27edb
Joachim Sauer [Mon, 4 Dec 2017 11:28:22 +0000 (11:28 +0000)]
Merge "Adjust tests to new android-support-test + espresso libraries." am:
809062c26d -s ours
am:
db3a1f2882 -s ours
Change-Id: I5b2d7de32ee3c9d88de73d0aae3c9e2ba9c05f62
Joachim Sauer [Mon, 4 Dec 2017 11:12:50 +0000 (11:12 +0000)]
Merge "Adjust tests to new android-support-test + espresso libraries."
am:
809062c26d -s ours
Change-Id: I9691f0221998569194b453619e90a214776ae6ab
Joachim Sauer [Mon, 4 Dec 2017 10:56:21 +0000 (10:56 +0000)]
Merge "Adjust tests to new android-support-test + espresso libraries."
Colin Cross [Thu, 16 Nov 2017 08:15:28 +0000 (00:15 -0800)]
Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.
Bug:
69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit
cf3a0b5355c6138538f9f3d4b369a875814bc01c)
Colin Cross [Thu, 16 Nov 2017 08:15:28 +0000 (00:15 -0800)]
Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.
Bug:
69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit
cf3a0b5355c6138538f9f3d4b369a875814bc01c)
Andreas Gampe [Sat, 2 Dec 2017 23:54:49 +0000 (23:54 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to Future" am:
aa3e9d351e
am:
bd4b1bad48
Change-Id: I43c8231293f5e4349eaab6f4a8242892b3b2c726
Andreas Gampe [Sat, 2 Dec 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to Future"
am:
aa3e9d351e
Change-Id: I2a47400d1e584aef1a16e05840ab964ca5735110
Treehugger Robot [Sat, 2 Dec 2017 23:36:14 +0000 (23:36 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to Future"
wangmingming1 [Sat, 2 Dec 2017 03:14:30 +0000 (03:14 +0000)]
Merge "Prevent system app upgrading from multi-arch to single-arch" am:
5cac6ed047
am:
58a0809802
Change-Id: I406ed219fcf24745bde9c7fe45570d62378fbd85
wangmingming1 [Sat, 2 Dec 2017 03:06:41 +0000 (03:06 +0000)]
Merge "Prevent system app upgrading from multi-arch to single-arch"
am:
5cac6ed047
Change-Id: I0e7c6fbea14dcf401076994fa53b9ce66324bb4a
Treehugger Robot [Sat, 2 Dec 2017 02:54:33 +0000 (02:54 +0000)]
Merge "Prevent system app upgrading from multi-arch to single-arch"
Hall Liu [Sat, 2 Dec 2017 02:35:48 +0000 (02:35 +0000)]
Merge "Set sIsInitialized to false and add logging" am:
a0a70be251
am:
cfa4bb4bf3
Change-Id: Ide646190e22cdbc3fbea9a7fb6b813bd90bd6d40
Hall Liu [Sat, 2 Dec 2017 02:09:03 +0000 (02:09 +0000)]
Merge "Set sIsInitialized to false and add logging"
am:
a0a70be251
Change-Id: I578a9f5690d2320116427025f831e11c9ffcdd7d
Hall Liu [Sat, 2 Dec 2017 01:35:15 +0000 (01:35 +0000)]
Merge "Set sIsInitialized to false and add logging"
Rubin Xu [Sat, 2 Dec 2017 00:19:39 +0000 (00:19 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
am:
b3ce6d33e0
Change-Id: Ie63ae6deb6a0454aa32a93f9aa867189c7390cdb
TreeHugger Robot [Sat, 2 Dec 2017 00:01:31 +0000 (00:01 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-dev
TreeHugger Robot [Fri, 1 Dec 2017 23:53:03 +0000 (23:53 +0000)]
Merge "Swap the order of synthetic password wrapping" into oc-mr1-dev
wangmingming1 [Tue, 21 Nov 2017 09:29:38 +0000 (17:29 +0800)]
Prevent system app upgrading from multi-arch to single-arch
We should not let user to manully upgrade a system app which supports
multi-arch to a newer version which supports only one cpu abi. Take
webview as an example, if the user upgraded the webview to a version
supports only armeabi-v7a on Nexus 5X by mistake, then any app supports
only arm64-v8a and uses webview to display web contents would not work
properly then as loading a 32bit native lib inside a 64bit mode process
is not allowed.
Test: Manual
Change-Id: I567be7707fc18421ff686c1e8b1110dec517e06d
Signed-off-by: wangmingming1 <wangmingming1@xiaomi.com>
Hall Liu [Fri, 1 Dec 2017 22:01:15 +0000 (14:01 -0800)]
Set sIsInitialized to false and add logging
When the service goes away due to a remote exception, set sIsInitialized
to false as well as setting the service to null.
Also log the serviceconnection disconnect.
Bug:
70032958
Test: cts
Change-Id: I34c1ea804537c62bd4348ba3aeeca7ba2c0becb6
Kevin Hufnagle [Fri, 1 Dec 2017 20:48:23 +0000 (20:48 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am:
a96e533840 am:
87b5b0aa1a
am:
9d3563ad78
Change-Id: I3355b274bf2fad2190cd21f16c01e218a17c8b56
Kevin Hufnagle [Fri, 1 Dec 2017 20:27:49 +0000 (20:27 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev am:
a96e533840
am:
87b5b0aa1a
Change-Id: Iabdbdf3f19e5faa4a0e980afc4d643dad192fc62
Kevin Hufnagle [Fri, 1 Dec 2017 20:20:44 +0000 (20:20 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
am:
a96e533840
Change-Id: Iefd97a3d8b1377dd72f3a3428c539cb029b4e0a9
Kevin Hufnagle [Fri, 1 Dec 2017 20:06:38 +0000 (20:06 +0000)]
Merge "Merge from oc-preview-docs-release: docs: Added note that INSTALL_SHORTCUT is implicit broadcast as of O." into oc-dev
Andrew Solovay [Fri, 1 Dec 2017 19:40:06 +0000 (19:40 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
am:
039d9713a8
Change-Id: I6948a7b02b873d6c1af49da926d81d762ef6b82c
TreeHugger Robot [Fri, 1 Dec 2017 19:30:44 +0000 (19:30 +0000)]
Merge "docs: Fixed description of SENSORS permission group" into oc-mr1-dev
Andrew Solovay [Fri, 1 Dec 2017 19:29:13 +0000 (19:29 +0000)]
Merge "docs: Add note to getFrameAtTime() pointing to getScaledFrameAtTime()" into oc-mr1-dev
am:
284259a633
Change-Id: Ic8c9f91f1fc1e6c32bae90d8bf8fbe6b91beb712
OSDN Git Service
