OSDN Git Service
Jordan Liu [Thu, 7 Dec 2017 23:17:11 +0000 (23:17 +0000)]
Merge "Fix available/remaining PIN/PUK attempts."
Treehugger Robot [Thu, 7 Dec 2017 21:37:45 +0000 (21:37 +0000)]
Merge "Bluetooth HID Device: format code, fix docstring, hide unplug()"
Svetoslav Ganov [Thu, 7 Dec 2017 17:43:52 +0000 (17:43 +0000)]
Merge "Use correct user id for permission check for instant foreground service"
Jeff Sharkey [Thu, 7 Dec 2017 16:39:39 +0000 (16:39 +0000)]
Merge changes from topic "predicates_aosp"
* changes:
Deeper sanity checking of emitted types.
Emit all APIs using Predicates.
Massage APIs for upcoming doclava change.
Treehugger Robot [Thu, 7 Dec 2017 14:53:04 +0000 (14:53 +0000)]
Merge "fix system app's abi error after uninstall updated version."
Neil Fuller [Thu, 7 Dec 2017 11:02:52 +0000 (11:02 +0000)]
Merge "Fix doc typo. Improve class javadoc..."
Ruthwar Kumar Ambeer [Thu, 9 Mar 2017 13:16:17 +0000 (18:46 +0530)]
Fix available/remaining PIN/PUK attempts.
* Fix to properly display attempts remaining for PIN/PUK.
* On bootup show the available PIN/PUK attempts if sim
is locked on PIN/PUK.
* Show incorrect password message on entering wrong PIN/PUK
password.
In KeyGuardSimPinView and KeyGuardSimPukView, check for sim locked on
PIN and reset the flags to show the default message.
Bug:
37782683
Change-Id: I46d7d5dd86977cddecf3147add73ef6ccc64b257
Treehugger Robot [Thu, 7 Dec 2017 08:15:35 +0000 (08:15 +0000)]
Merge "Disable AVB check in runtime vintf"
Svet Ganov [Thu, 7 Dec 2017 07:45:38 +0000 (23:45 -0800)]
Use correct user id for permission check for instant foreground service
Test: cts-tradefed run cts-dev -m CtsAppSecurityHostTestCases
-t android.appsecurity.cts.EphemeralTest#testStartForegrondService
bug:
68275646
Change-Id: I196522c49ae8a7e0ec07bf631f04bae51e96db5b
liulvping [Mon, 6 Nov 2017 09:36:40 +0000 (17:36 +0800)]
fix system app's abi error after uninstall updated version.
When uninstall an updated system app, we always did as
following steps. First we delete data structure by calling
deleteInstalledPackageLIF(), then enable it from disabled
system packages and re-adding to PackageSettings map by
calling addPackageLPw(). At last re-installing apps in
system partition with scanPackageTracedLI().
But if an package with sharedUserId readded failed with
exception of 'Adding duplicate shared id: xxx', then we
cann't reuse it's derived CPU Abis from settings, others
we could get CPU Abis uninitialized errors.
Test: Manual; Update an system app with sharedUserId
Test: Manual; Uninstall and ensure it run ok
Change-Id: Icfda17c5004d291c664ed80d578aca4b7cf4a975
Signed-off-by: liulvping <liulvping@xiaomi.com>
Jeff Sharkey [Thu, 7 Dec 2017 04:12:23 +0000 (21:12 -0700)]
Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types. This ensures that we don't accidentally
reference undefined classes/interfaces.
Test: manual inspection of API files
Bug:
69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Jeff Sharkey [Thu, 7 Dec 2017 04:02:11 +0000 (21:02 -0700)]
Emit all APIs using Predicates.
Generate APIs using updated doclava.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
Jeff Sharkey [Thu, 7 Dec 2017 03:53:38 +0000 (20:53 -0700)]
Massage APIs for upcoming doclava change.
These changes are needed to ensure that "checkapi" doesn't claim
that we're changing the API after an upcoming doclava change.
Test: manual inspection of API text files
Bug:
69505783
Change-Id: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Merged-In: I8292ba80cc65b7dd78f0e9dba4fcc7ffcedfab9c
Treehugger Robot [Thu, 7 Dec 2017 04:02:29 +0000 (04:02 +0000)]
Merge "Revert "Add odm sepolicy support to SELinuxMMAC.java""
Hansong Zhang [Mon, 4 Dec 2017 18:31:30 +0000 (10:31 -0800)]
Bluetooth HID Device: format code, fix docstring, hide unplug()
* Reformat code with google-java-format
* Add the note that When an application is registered, the HID Host service
will be disabled until it is unregistered
* Fix the links in docstring
* Add @hide to unplug(); this is not a public API
Bug:
63384609
Test: make
Change-Id: I5dfcaab58b02c19e5745461c16602064a0ad8b83
Bo Hu [Wed, 6 Dec 2017 22:17:32 +0000 (22:17 +0000)]
Revert "Add odm sepolicy support to SELinuxMMAC.java"
This reverts commit
fffa6d238a31ac5e7b30a6e1d852c8c2cc22af1d.
Reason for revert: broke mac build
b/
70273082
FAILED: out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil
/bin/bash -c "(out/host/darwin-x86/bin/version_policy -b out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil -t out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil -n 10000.0 -o out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp ) && (grep -Fxv -f out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil.tmp > out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil ) && (out/host/darwin-x86/bin/secilc -m -M true -G -N -c 30 out/target/product/generic_x86/obj/ETC/plat_sepolicy.cil_intermediates/plat_sepolicy.cil out/target/product/generic_x86/obj/ETC/plat_pub_versioned.cil_intermediates/plat_pub_versioned.cil out/target/product/generic_x86/obj/ETC/10000.0.cil_intermediates/10000.0.cil out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_sepolicy.cil -o /dev/null -f /dev/null )"
Parsing out/target/product/generic_x86/obj/FAKE/selinux_policy_intermediates/plat_pub_policy.cil
Parsing out/target/product/generic_x86/obj/ETC/vendor_sepolicy.cil_intermediates/vendor_policy_raw.cil
grep: out of memory
Change-Id: I186f7bc68a76d7b2d717875791ee2fe1828c3598
Xin Li [Wed, 6 Dec 2017 23:18:26 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Merge Oreo MR1 into master"
Xin Li [Wed, 6 Dec 2017 19:51:59 +0000 (11:51 -0800)]
DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I727a014df2fb05a4b13cb67b1fcb760a8b387523
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Treehugger Robot [Wed, 6 Dec 2017 19:22:44 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothManagerService.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:38 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothAdapter.java"
Myles Watson [Tue, 28 Nov 2017 00:42:11 +0000 (16:42 -0800)]
Auto-format BluetoothManagerService.java
Test: build
Change-Id: If97c454a8e5aff34c4f8550f7ade3da413a200b7
Myles Watson [Tue, 28 Nov 2017 00:41:47 +0000 (16:41 -0800)]
Auto-format BluetoothAdapter.java
Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9
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: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:29:35 +0000 (03:29 +0000)]
Merge "Cleanup of resource limit tests"
am:
39f58678db
Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206
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 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: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: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: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: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:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am:
d0abc863f4
Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d
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: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 [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: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
Hansong Zhang [Fri, 1 Dec 2017 00:37:05 +0000 (16:37 -0800)]
Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)
Bug:
69981563
Test: HID Device SL4A Test
Change-Id: Ifb7002bb4f3f6f29b01a3d337ab68b674d6947c9
Neil Fuller [Mon, 4 Dec 2017 13:54:57 +0000 (13:54 +0000)]
Fix doc typo. Improve class javadoc...
Fix doc typo (value -> valid). Improve class javadoc,
fix lint error in import ordering.
Test: Build
Change-Id: I8899b1f568e052a3d152e6c36fca4d6bbf9584f2
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
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: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: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: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"
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
Brett Chabot [Mon, 26 Jun 2017 22:58:49 +0000 (15:58 -0700)]
Adjust tests to new android-support-test + espresso libraries.
(cherry picked from commit
85544ba5eb3642976ea0f85fb9e86401661afc2b)
Bug:
69455082
Test: make tests
Change-Id: I563776a0dd821af4abba47df79e14c255097836d
Merged-In: I7a41199cd7f0739f660a49b1af32e64f58590301
Hans Boehm [Fri, 1 Dec 2017 15:46:09 +0000 (15:46 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."
am:
db122f90d9
Change-Id: Ibc470d844139fd2f74434a26d01903c67eb51f86
Hans Boehm [Fri, 1 Dec 2017 15:34:29 +0000 (15:34 +0000)]
Merge "Ensure that debug builds crash again if there is a BinderProxy leak."
Paul Duffin [Fri, 1 Dec 2017 10:26:30 +0000 (10:26 +0000)]
Merge "Build overlaytests as part of the normal build"
am:
ce2362fc7d
Change-Id: I11c3b75763f5bd5c8c4239d9a5135da7e18df03f
Paul Duffin [Fri, 1 Dec 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Build overlaytests as part of the normal build"
Cassie [Fri, 1 Dec 2017 05:30:06 +0000 (05:30 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am:
298d2a46dc
Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3
Treehugger Robot [Fri, 1 Dec 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Bowgo Tsai [Fri, 17 Nov 2017 09:18:50 +0000 (17:18 +0800)]
Disable AVB check in runtime vintf
GSI disables AVB by overriding vbmeta partition.
When a device can run runtime vintf checking, it should already
pass AVB, so we don't need to check AVB in runtime vintf.
We cannot change the original VintfObject.verify() because AVB check is
still needed for android.os.RecoverySystem to verify a newly downloaded
OTA package.
Bug:
68016134
Test: Boot with GSI and there is no Android System dialog
Change-Id: Ie1efa6f1abd8fa8f495aededd145c0ab2c0c1fae
Merged-In: Ie1efa6f1abd8fa8f495aededd145c0ab2c0c1fae
Calin Juravle [Fri, 1 Dec 2017 01:33:54 +0000 (01:33 +0000)]
Merge changes I80504f43,Ifc372eef
am:
de7be840a7
Change-Id: Id86c979498e13f5e382c5a448becee8f7bfe72f0
Treehugger Robot [Fri, 1 Dec 2017 01:09:30 +0000 (01:09 +0000)]
Merge changes I80504f43,Ifc372eef
* changes:
Fix package install flow w.r.t. dexopt
Do not apply app-link autoVerify policy to instant app installs
Jordan Liu [Fri, 1 Dec 2017 00:36:14 +0000 (00:36 +0000)]
Merge "IMS: Add new APIs for call barring operations"
am:
c1c29dbf45
Change-Id: Ibb11c26494791baac116fb561c03cbdc371766a1
Jordan Liu [Fri, 1 Dec 2017 00:25:43 +0000 (00:25 +0000)]
Merge "IMS: Add new APIs for call barring operations"
Cassie [Thu, 30 Nov 2017 23:54:51 +0000 (15:54 -0800)]
Quick fix the getMobileNetworkOperator() in CellIdentity.
Bug:
69915536
Test: Basic telephony sanity
Change-Id: Iac8222055aea95fbb5334876124ce9d1571ae2f6
Calin Juravle [Thu, 16 Nov 2017 00:28:01 +0000 (16:28 -0800)]
Fix package install flow w.r.t. dexopt
Calling dexopt before the applicationInfo gets the uid is wrong.
Dexopt needs to be able to set the GID of the odex file to the
UserHandle.getSharedAppGid(pkg.applicationInfo.uid) and that is
possible only with a valid uid.
Move the dexopt logic after installNewPackageLIF/replacePackageLIF
to ensure that we get a valid uid.
Bug:
69331247
Test: adb install & check the GID of the compiler artifacts
(cherry picked from commit
c6540daf8388ce1ebd2e4157ec70b9651ae14b4f)
Merged-In: I2434a1a0b9015091a9af2009b3f785b7a16e1256
Change-Id: I80504f434e1507f30f366d1122224ff959bec4a1