OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Hansong Zhang [Wed, 6 Dec 2017 20:33:29 +0000 (20:33 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
am: 8ab47567b2

Change-Id: I9ea9a2d7bd5a81816fb652b643f345459bc2fdc5

6 years agoMerge "Auto-format BluetoothManagerService.java"
Myles Watson [Wed, 6 Dec 2017 20:10:37 +0000 (20:10 +0000)]
Merge "Auto-format BluetoothManagerService.java"
am: 004731bee7

Change-Id: If846012a106be1ef097a2bc7bb17db093224cfa0

6 years agoMerge "Auto-format BluetoothAdapter.java"
Myles Watson [Wed, 6 Dec 2017 20:04:07 +0000 (20:04 +0000)]
Merge "Auto-format BluetoothAdapter.java"
am: 5416559d1c

Change-Id: Ib5aa26901a97702fb4714dd89f24a112af59895b

6 years agoMerge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"
Treehugger Robot [Wed, 6 Dec 2017 19:34:22 +0000 (19:34 +0000)]
Merge "Bluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)"

6 years agoMerge "Auto-format BluetoothManagerService.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:44 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothManagerService.java"

6 years agoMerge "Auto-format BluetoothAdapter.java"
Treehugger Robot [Wed, 6 Dec 2017 19:22:38 +0000 (19:22 +0000)]
Merge "Auto-format BluetoothAdapter.java"

6 years agoAuto-format BluetoothManagerService.java
Myles Watson [Tue, 28 Nov 2017 00:42:11 +0000 (16:42 -0800)]
Auto-format BluetoothManagerService.java

Test: build
Change-Id: If97c454a8e5aff34c4f8550f7ade3da413a200b7

6 years agoAuto-format BluetoothAdapter.java
Myles Watson [Tue, 28 Nov 2017 00:41:47 +0000 (16:41 -0800)]
Auto-format BluetoothAdapter.java

Test: build
Change-Id: I7bfc729373a24cceee05e443195640ff7f6d43b9

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
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

6 years agoMerge "SystemUI: Display RAT icon in quick setting when data is off"
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"

6 years agoMerge "Add odm sepolicy support to SELinuxMMAC.java"
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

6 years agoMerge "Add odm sepolicy support to SELinuxMMAC.java"
Treehugger Robot [Wed, 6 Dec 2017 10:00:46 +0000 (10:00 +0000)]
Merge "Add odm sepolicy support to SELinuxMMAC.java"

6 years agoMerge "Cleanup of resource limit tests"
ludi [Wed, 6 Dec 2017 03:29:35 +0000 (03:29 +0000)]
Merge "Cleanup of resource limit tests"
am: 39f58678db

Change-Id: Ifcbc61ad8003c43ba1baff6d4d534192f6498206

6 years agoMerge "Support scanDirectories with JNI callback function"
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

6 years agoMerge "Don't remove bonding device from cached device list during inquiry"
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

6 years agoMerge "Use -Werror in frameworks/base/tests/backup"
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

6 years agoMerge "Cleanup of resource limit tests"
Treehugger Robot [Wed, 6 Dec 2017 02:58:41 +0000 (02:58 +0000)]
Merge "Cleanup of resource limit tests"

6 years agoMerge "Support scanDirectories with JNI callback function"
Treehugger Robot [Wed, 6 Dec 2017 02:06:49 +0000 (02:06 +0000)]
Merge "Support scanDirectories with JNI callback function"

6 years agoMerge "Don't remove bonding device from cached device list during inquiry"
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"

6 years agoMerge "Use -Werror in frameworks/base/tests/backup"
Chih-hung Hsieh [Wed, 6 Dec 2017 00:25:20 +0000 (00:25 +0000)]
Merge "Use -Werror in frameworks/base/tests/backup"

6 years agoDon't remove bonding device from cached device list during inquiry
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

6 years agoSystemUI: Display RAT icon in quick setting when data is off
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

6 years agoUse -Werror in frameworks/base/tests/backup
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

6 years agoMerge "Fix bug in MacAddress.fromString()"
Hugo Benichi [Tue, 5 Dec 2017 09:47:50 +0000 (09:47 +0000)]
Merge "Fix bug in MacAddress.fromString()"
am: cdb84d2fc7

Change-Id: If4c85f0a5ea259f53f9cffa6eacb58fcde1fd1df

6 years agoMerge "Fix bug in MacAddress.fromString()"
Treehugger Robot [Tue, 5 Dec 2017 09:38:42 +0000 (09:38 +0000)]
Merge "Fix bug in MacAddress.fromString()"

6 years agoMerge "Don't use path to find protoc-gen-javastream"
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

6 years agoMerge "Don't use path to find protoc-gen-javastream"
Treehugger Robot [Tue, 5 Dec 2017 05:22:25 +0000 (05:22 +0000)]
Merge "Don't use path to find protoc-gen-javastream"

6 years agoFix bug in MacAddress.fromString()
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

6 years agoMerge "Frameworks: Silently ignore InterruptedException"
Andreas Gampe [Tue, 5 Dec 2017 02:34:41 +0000 (02:34 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"
am: 7e717e09cd

Change-Id: I75da071918e7fc2e547df4e4d75121806c730ca2

6 years agoMerge "Validate IpSecAlgorithm Length"
nharold [Tue, 5 Dec 2017 02:28:10 +0000 (02:28 +0000)]
Merge "Validate IpSecAlgorithm Length"
am: 68b81299d2

Change-Id: I23f7612c119e67f9a1647568aeefde38a365f8da

6 years agoMerge "Frameworks: Silently ignore InterruptedException"
Treehugger Robot [Tue, 5 Dec 2017 02:25:14 +0000 (02:25 +0000)]
Merge "Frameworks: Silently ignore InterruptedException"

6 years agoMerge "Validate IpSecAlgorithm Length"
nharold [Tue, 5 Dec 2017 02:13:55 +0000 (02:13 +0000)]
Merge "Validate IpSecAlgorithm Length"

6 years agoMerge "Fix droiddoc when OUT_DIR is an absolute path"
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

6 years agoMerge "Match network roaming state to avoid wtf()."
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

6 years agoDon't use path to find protoc-gen-javastream
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

6 years agoMerge "Fix droiddoc when OUT_DIR is an absolute path"
Colin Cross [Tue, 5 Dec 2017 01:08:41 +0000 (01:08 +0000)]
Merge "Fix droiddoc when OUT_DIR is an absolute path"

6 years agoFix 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)

6 years agoMerge "Match network roaming state to avoid wtf()."
Jeff Sharkey [Tue, 5 Dec 2017 00:58:46 +0000 (00:58 +0000)]
Merge "Match network roaming state to avoid wtf()."

6 years agoMerge "Remove unused AIDL files"
Colin Cross [Tue, 5 Dec 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Remove unused AIDL files"
am: d0abc863f4

Change-Id: Ia6d798f6acf3930945cac488db81ccec3792648d

6 years agoMerge "Make it possible to hide signal strength via Carrier Config"
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

6 years agoMerge "MacAddress: light refactors and improve documentation"
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

6 years agoMerge "Remove unused AIDL files"
Treehugger Robot [Mon, 4 Dec 2017 23:35:35 +0000 (23:35 +0000)]
Merge "Remove unused AIDL files"

6 years agoMerge "Make it possible to hide signal strength via Carrier Config"
Jordan Liu [Mon, 4 Dec 2017 23:20:31 +0000 (23:20 +0000)]
Merge "Make it possible to hide signal strength via Carrier Config"

6 years agoValidate IpSecAlgorithm Length
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

6 years agoMerge "MacAddress: light refactors and improve documentation"
Treehugger Robot [Mon, 4 Dec 2017 23:01:11 +0000 (23:01 +0000)]
Merge "MacAddress: light refactors and improve documentation"

6 years agoFrameworks: Silently ignore InterruptedException
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

6 years agoMatch network roaming state to avoid wtf().
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

6 years agoMerge "Convert ICarrierService to oneway."
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

6 years agoMerge "Convert ICarrierService to oneway."
Ying Xu [Mon, 4 Dec 2017 22:11:36 +0000 (22:11 +0000)]
Merge "Convert ICarrierService to oneway."

6 years agoRemove unused AIDL files
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

6 years agoMerge "Convert framework.jar to Android.bp"
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

6 years agoMerge "Convert framework.jar to Android.bp"
Colin Cross [Mon, 4 Dec 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Convert framework.jar to Android.bp"

6 years agoMerge "Convert framework.jar to Android.bp" into stage-aosp-master
Colin Cross [Mon, 4 Dec 2017 18:43:35 +0000 (18:43 +0000)]
Merge "Convert framework.jar to Android.bp" into stage-aosp-master

6 years agoConvert ICarrierService to oneway.
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

6 years agoBluetooth HID Device: Remove BluetoothHidDeviceAppConfiguration (2/4)
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

6 years agoMerge "SystemUI: Display RAT icon when data is off"
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

6 years agoMerge "SystemUI: Display RAT icon when data is off"
Evan Laird [Mon, 4 Dec 2017 14:37:16 +0000 (14:37 +0000)]
Merge "SystemUI: Display RAT icon when data is off"

6 years agoMacAddress: light refactors and improve documentation
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

6 years agoMerge "Adjust tests to new android-support-test + espresso libraries."
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

6 years agoMerge "Adjust tests to new android-support-test + espresso libraries."
Joachim Sauer [Mon, 4 Dec 2017 10:56:21 +0000 (10:56 +0000)]
Merge "Adjust tests to new android-support-test + espresso libraries."

6 years agoConvert framework.jar to Android.bp
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)

6 years agoConvert framework.jar to Android.bp
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)

6 years agoMerge "Frameworks: Move SharedPreferencesImpl to Future"
Andreas Gampe [Sat, 2 Dec 2017 23:45:54 +0000 (23:45 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to Future"
am: aa3e9d351e

Change-Id: I2a47400d1e584aef1a16e05840ab964ca5735110

6 years agoMerge "Frameworks: Move SharedPreferencesImpl to Future"
Treehugger Robot [Sat, 2 Dec 2017 23:36:14 +0000 (23:36 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to Future"

6 years agoMerge "Prevent system app upgrading from multi-arch to single-arch"
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

6 years agoMerge "Prevent system app upgrading from multi-arch to single-arch"
Treehugger Robot [Sat, 2 Dec 2017 02:54:33 +0000 (02:54 +0000)]
Merge "Prevent system app upgrading from multi-arch to single-arch"

6 years agoMerge "Set sIsInitialized to false and add logging"
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

6 years agoMerge "Set sIsInitialized to false and add logging"
Hall Liu [Sat, 2 Dec 2017 01:35:15 +0000 (01:35 +0000)]
Merge "Set sIsInitialized to false and add logging"

6 years agoPrevent system app upgrading from multi-arch to single-arch
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>
6 years agoSet sIsInitialized to false and add logging
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

6 years agoAdjust tests to new android-support-test + espresso libraries.
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

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
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

6 years agoMerge "Ensure that debug builds crash again if there is a BinderProxy leak."
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."

6 years agoMerge "Build overlaytests as part of the normal build"
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

6 years agoMerge "Build overlaytests as part of the normal build"
Paul Duffin [Fri, 1 Dec 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Build overlaytests as part of the normal build"

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Cassie [Fri, 1 Dec 2017 05:30:06 +0000 (05:30 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."
am: 298d2a46dc

Change-Id: I53f8165577dc7cdd98301b5752a32cc19d0dc8b3

6 years agoMerge "Quick fix the getMobileNetworkOperator() in CellIdentity."
Treehugger Robot [Fri, 1 Dec 2017 05:19:29 +0000 (05:19 +0000)]
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity."

6 years agoMerge changes I80504f43,Ifc372eef
Calin Juravle [Fri, 1 Dec 2017 01:33:54 +0000 (01:33 +0000)]
Merge changes I80504f43,Ifc372eef
am: de7be840a7

Change-Id: Id86c979498e13f5e382c5a448becee8f7bfe72f0

6 years agoMerge changes I80504f43,Ifc372eef
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

6 years agoMerge "IMS: Add new APIs for call barring operations"
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

6 years agoMerge "IMS: Add new APIs for call barring operations"
Jordan Liu [Fri, 1 Dec 2017 00:25:43 +0000 (00:25 +0000)]
Merge "IMS: Add new APIs for call barring operations"

6 years agoQuick fix the getMobileNetworkOperator() in CellIdentity.
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

6 years agoFix package install flow w.r.t. dexopt
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

6 years agoDo not apply app-link autoVerify policy to instant app installs
Christopher Tate [Thu, 5 Oct 2017 00:38:20 +0000 (17:38 -0700)]
Do not apply app-link autoVerify policy to instant app installs

Bug: 66698768
Test: manual

(cherry picked from commit 05941b396a44bd81c143b727e5c4c630212228e0)

Merged-In: Ib9bea22bf8096e708eef93934e0e972be3a2a4c5
Change-Id: Ifc372eef9bc2a140b9252c85f9be0c2ff9cdbb4c

6 years agoEnsure that debug builds crash again if there is a BinderProxy leak.
Hans Boehm [Fri, 3 Nov 2017 22:56:59 +0000 (15:56 -0700)]
Ensure that debug builds crash again if there is a BinderProxy leak.

This fails when trying to run the AOSP mailer with CRASH_AT_SIZE = 500,
when the check interval is reduced sufficiently so that the test is
actually executed. System server has been observed to use more than
1000 BinderProxies. Thus 5000 seems like roughly the lowest safe limit.

Note that the test is executed somewhat rarely, so we may exceed
this number by quite a few before we actually crash.

Bug: 65760710
Test: Builds, AOSP boots & works for a few tasks. Fails as expected
with reduced limit.

Change-Id: I1c999b85e1ba1bd1d166a9ffba4f0b3992ffee45

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:18:38 +0000 (23:18 +0000)]
Merge "Fix warning from clang+mingw"
am: 7fce15dc5e

Change-Id: I1b318913c3ead77369bdb62c10e5e08803cb10b8

6 years agoMerge "Fix warning from clang+mingw"
Dan Willemsen [Thu, 30 Nov 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Fix warning from clang+mingw"

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:05:04 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:02:50 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:02:12 +0000 (21:02 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:01:29 +0000 (21:01 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:40 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 21:00:00 +0000 (21:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:58:41 +0000 (20:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:57:44 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:56:37 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:53:57 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Thu, 30 Nov 2017 20:52:04 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Add SMS over IMS APIs"
Mohamed [Thu, 30 Nov 2017 16:05:36 +0000 (16:05 +0000)]
Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913

6 years agoMerge "Add SMS over IMS APIs"
Treehugger Robot [Thu, 30 Nov 2017 15:56:30 +0000 (15:56 +0000)]
Merge "Add SMS over IMS APIs"