OSDN Git Service
Lorenzo Colitti [Tue, 16 Jan 2018 13:34:46 +0000 (13:34 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest." am:
a04d0cc72f
am:
503135596b
Change-Id: I5e8e57f38580742eae38f63f43e37cc647412212
Lorenzo Colitti [Tue, 16 Jan 2018 13:23:05 +0000 (13:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
am:
a04d0cc72f
Change-Id: Ie4524e17f1839bae832d03248a2208693b1b1e95
Treehugger Robot [Tue, 16 Jan 2018 12:23:02 +0000 (12:23 +0000)]
Merge "Update netId to nethandle mapping in NetworkTest."
Paul Duffin [Tue, 16 Jan 2018 11:40:57 +0000 (11:40 +0000)]
Merge "Replace legacy-test with android.test.base in bp files" am:
2285630e4b
am:
caacf3e7c4
Change-Id: I0fa822af057afc2f4efb6285404653fe57bcd742
Paul Duffin [Tue, 16 Jan 2018 11:29:21 +0000 (11:29 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
am:
2285630e4b
Change-Id: If956b45e21b7d576daf5dcece9c1acea35d952a0
Paul Duffin [Tue, 16 Jan 2018 10:47:47 +0000 (10:47 +0000)]
Merge "Replace legacy-test with android.test.base in bp files"
Hugo Benichi [Tue, 16 Jan 2018 10:30:20 +0000 (10:30 +0000)]
Merge "MacAddress: add @NonNull annotations" am:
e65a016d76
am:
a7c125e5b2
Change-Id: Icaa08c082797c6dbc3382e0662e24e1c84114175
Hugo Benichi [Tue, 16 Jan 2018 10:18:55 +0000 (10:18 +0000)]
Merge "MacAddress: add @NonNull annotations"
am:
e65a016d76
Change-Id: Ia1ea828cfd33b5287639e4fd3ab248a58650168b
Lorenzo Colitti [Tue, 16 Jan 2018 08:18:17 +0000 (17:18 +0900)]
Update netId to nethandle mapping in NetworkTest.
Bug:
63052780
Test: NetworkTest now passes
Change-Id: I5f1cb3055b7042a19afb5dd62f082912157612ba
Hugo Benichi [Tue, 16 Jan 2018 07:10:50 +0000 (07:10 +0000)]
Merge "MacAddress: add @NonNull annotations"
Lorenzo Colitti [Tue, 16 Jan 2018 05:16:34 +0000 (05:16 +0000)]
Merge "Change the netId to nethandle mapping." am:
9456c020d8
am:
feaf412e19
Change-Id: Idd1b2f462c1c78bdb68b43a4aa77bf2358f7cb52
Lorenzo Colitti [Tue, 16 Jan 2018 05:06:50 +0000 (05:06 +0000)]
Merge "Change the netId to nethandle mapping."
am:
9456c020d8
Change-Id: I605ea54ff9e8e32e4fad6f0346b37849fadbc81a
Hugo Benichi [Fri, 12 Jan 2018 00:46:29 +0000 (09:46 +0900)]
MacAddress: add @NonNull annotations
This patch adds to the MacAddress class:
- getAddressType() method which replaces addressType(), for naming
consistency
- @NonNull annotations on all input and output reference values for
all public methods (@hide and public).
TYPE_UNKNOWN, which currently cannot be observed with a non @hide
method, is also removed from the public api.
Bug:
71866627
Test: $ runtest frameworks-net
Change-Id: I2af70408d46f431b7b32183e6b48ddae9a261a2c
Treehugger Robot [Tue, 16 Jan 2018 02:58:56 +0000 (02:58 +0000)]
Merge "Change the netId to nethandle mapping."
Hugo Benichi [Tue, 16 Jan 2018 02:31:48 +0000 (02:31 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled" am:
46e9e35835
am:
2d59e3cab0
Change-Id: Icadee616fc95e1c126285524dfe49331fcf87462
Hugo Benichi [Tue, 16 Jan 2018 02:18:29 +0000 (02:18 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
am:
46e9e35835
Change-Id: I2abc857093879955eae62802f152c96c1ee942f3
Hugo Benichi [Tue, 16 Jan 2018 00:20:52 +0000 (00:20 +0000)]
Merge "ConnectivityService: synchronize access on mLockdownEnabled"
Lorenzo Colitti [Tue, 5 Sep 2017 02:15:37 +0000 (11:15 +0900)]
Change the netId to nethandle mapping.
Being able to update this handle is necessary to ensure that
system-only OTAs do not break vendor code that relies on
nethandles.
Bug:
63052780
Test: walleye builds, boots, networking works
Test: MultinetworkApiTest CTS tests passes
Change-Id: I049a4ad2610ca68b8f56377b63be7e5e8ce76039
Paul Duffin [Mon, 15 Jan 2018 15:47:47 +0000 (15:47 +0000)]
Replace legacy-test with android.test.base in bp files
The legacy-test target is deprecated and will be replaced by
android.test.base. This replaces a few usages of the legacy-test target
in Android.bp files with android.test.base.
Bug:
30188076
Test: make checkbuild
Change-Id: I3575f638114fe2a3b703e67837496346bde24472
vichang [Mon, 15 Jan 2018 15:40:02 +0000 (15:40 +0000)]
Merge "Add a new API android.icu.util.LocaleData" am:
9cb0b52011
am:
926407257d
Change-Id: I5c9449a9778a8a09df43ae779a3188969077e797
vichang [Mon, 15 Jan 2018 15:26:31 +0000 (15:26 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
am:
9cb0b52011
Change-Id: I159748036ae2a59ea79cf191ec4cf19ba1f5bbad
Erik Kline [Mon, 15 Jan 2018 14:38:08 +0000 (14:38 +0000)]
Merge "change NMS removeNetwork to netd binder variant" am:
e61ee4198e
am:
b73571b981
Change-Id: I6de7f38c7081e14d817cc7aad44cb5b6a978328b
Erik Kline [Mon, 15 Jan 2018 14:28:48 +0000 (14:28 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
am:
e61ee4198e
Change-Id: I789653740c8cb1bb879215eaa3101f56d5bf7096
vichang [Mon, 15 Jan 2018 13:55:54 +0000 (13:55 +0000)]
Merge "Add a new API android.icu.util.LocaleData"
vichang [Mon, 15 Jan 2018 13:37:49 +0000 (13:37 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException" am:
a5fed7f526
am:
3c84896ced
Change-Id: Iea46598fce566f6075428cca9b10279dcb28eae4
vichang [Mon, 15 Jan 2018 13:21:57 +0000 (13:21 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
am:
a5fed7f526
Change-Id: I30faa7bfd7076f86abce9b31c546d1e49e34e7da
Treehugger Robot [Mon, 15 Jan 2018 12:39:09 +0000 (12:39 +0000)]
Merge "change NMS removeNetwork to netd binder variant"
vichang [Mon, 15 Jan 2018 11:56:58 +0000 (11:56 +0000)]
Merge "Expose API android.icu.util.IllformedLocaleException"
Erik Kline [Mon, 15 Jan 2018 08:05:07 +0000 (17:05 +0900)]
change NMS removeNetwork to netd binder variant
Also: require NETWORK_STACK instead of CONNECTIVITY_INTERNAL.
Bug:
34953048
Bug:
64133961
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net
Change-Id: I26f07f51a8a2f4a8bb43a276da7c5e66c355c848
Paul Duffin [Sat, 13 Jan 2018 21:25:58 +0000 (21:25 +0000)]
Merge "Remove junit classes from legacy-android-test" am:
4418418adb
am:
d724c112f3
Change-Id: I82688070910b342152f4076425ac2fedbf41be7c
Paul Duffin [Sat, 13 Jan 2018 21:13:12 +0000 (21:13 +0000)]
Merge "Remove junit classes from legacy-android-test"
am:
4418418adb
Change-Id: Id2966fd487ff95aa5a8e485756366df804765800
Paul Duffin [Sat, 13 Jan 2018 19:33:39 +0000 (19:33 +0000)]
Merge "Remove junit classes from legacy-android-test"
Paul Duffin [Sat, 13 Jan 2018 11:22:25 +0000 (11:22 +0000)]
Merge changes from topic "fix-legacy-android-test-spam" am:
22bd015cba
am:
fdc58270ef
Change-Id: I2f6dca4843d6f61efee1577ba5e88d16844cfbfe
Paul Duffin [Sat, 13 Jan 2018 11:17:46 +0000 (11:17 +0000)]
Move legacy-test to test-base am:
2141827700
am:
3f200744ae
Change-Id: I50ea451e6f8c80e47b7ff28b128d713e24aeb5f0
Paul Duffin [Sat, 13 Jan 2018 11:06:08 +0000 (11:06 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
am:
22bd015cba
Change-Id: Ib2be0591aba3b4a2f6b06becc9cd3f5de1a40532
Paul Duffin [Sat, 13 Jan 2018 11:00:30 +0000 (11:00 +0000)]
Move legacy-test to test-base
am:
2141827700
Change-Id: I231aa9f47f0bb8d6985eedc4db6630772dcc8c27
Paul Duffin [Fri, 12 Jan 2018 16:08:35 +0000 (16:08 +0000)]
Remove junit classes from legacy-android-test
A mistake during the conversion of the legacy-android-test target from
Android.mk to Android.bp caused some junit classes to be accidentally
included in the legacy-android-test target. That caused some warnings
about duplicate classes to be output during the build.
The junit classes are being included as part of the static library
android.test.runner. This fixes that by adding a new
android.test.runner-minus-junit which excludes the junit classes
and then using that instead.
Test: make checkbuild
Change-Id: Icd00b38c64d3416a55c1055f9716ddb78ec278f8
Paul Duffin [Sat, 13 Jan 2018 09:33:05 +0000 (09:33 +0000)]
Merge changes from topic "fix-legacy-android-test-spam"
* changes:
Added new android.test.base targets
Move legacy-test to test-base
zxuan [Sat, 13 Jan 2018 05:55:22 +0000 (05:55 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state." am:
895148087b
am:
5cea30c4ec
Change-Id: Ife2ac4b12d698f6db09bb3194eaea6994357828d
zxuan [Sat, 13 Jan 2018 05:42:00 +0000 (05:42 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
am:
895148087b
Change-Id: I1c3e4b67c4ab3e21f955b5fffcc2e019c73d6140
Treehugger Robot [Sat, 13 Jan 2018 04:09:42 +0000 (04:09 +0000)]
Merge "Add the user mobile data state into PhoneStateListener so that applications can listen to the change of the user mobile data state."
Jack Yu [Sat, 13 Jan 2018 03:32:58 +0000 (03:32 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress" am:
277c7d248c
am:
bd681cab22
Change-Id: Ic683f7fcc854e0e44e145da1fafc58f76f580637
Jack Yu [Sat, 13 Jan 2018 03:18:58 +0000 (03:18 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress"
am:
277c7d248c
Change-Id: Ib5f7151d0738e73067e734d7943cdc5b734a1039
Sanket Padawe [Sat, 13 Jan 2018 02:39:06 +0000 (02:39 +0000)]
Merge "Add permission check for old call handover apis." am:
e8fc3d2399
am:
7a97ee9acd
Change-Id: I864f2e645fd5ffd76ebd1e0d44a99c8f0b006504
Sanket Padawe [Sat, 13 Jan 2018 02:22:21 +0000 (02:22 +0000)]
Merge "Add permission check for old call handover apis."
am:
e8fc3d2399
Change-Id: I27f8d4eabbf979404ca5954161f0973012a4c484
Treehugger Robot [Sat, 13 Jan 2018 01:42:52 +0000 (01:42 +0000)]
Merge "Used LinkAddress insteaad of InterfaceAddress"
Sanket Padawe [Fri, 12 Jan 2018 23:50:40 +0000 (23:50 +0000)]
Merge "Add permission check for old call handover apis."
Yifan Hong [Fri, 12 Jan 2018 23:22:02 +0000 (23:22 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change." am:
eac8c121fe
am:
d9b9d49a66
Change-Id: I69512885ec3372e45f775bb7f6a8b828f8be490e
Joseph Pirozzo [Fri, 12 Jan 2018 23:11:03 +0000 (23:11 +0000)]
Merge "Bluetooth in band ring" am:
c9082cecb3
am:
cb87262975
Change-Id: I7d2b7843fd74e4505085ef693e4dc47d791b115a
Yifan Hong [Fri, 12 Jan 2018 23:05:35 +0000 (23:05 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change."
am:
eac8c121fe
Change-Id: Ia32c4395546ef58dee88bfbae77ea52d506a1c63
Hall Liu [Fri, 12 Jan 2018 23:01:16 +0000 (23:01 +0000)]
Merge "Use proper classloader when reading from parcel" am:
d3cb6380a4
am:
03a515aed4
Change-Id: I65070de075e8d09512d771c805c82043f04b3275
Joseph Pirozzo [Fri, 12 Jan 2018 22:58:42 +0000 (22:58 +0000)]
Merge "Bluetooth in band ring"
am:
c9082cecb3
Change-Id: I819b5510c45612b25d4fc1101d358f6d77691f12
Hall Liu [Fri, 12 Jan 2018 22:48:14 +0000 (22:48 +0000)]
Merge "Use proper classloader when reading from parcel"
am:
d3cb6380a4
Change-Id: I79c21859aa657b7a61e5cc8e7d60f79f736f34be
Treehugger Robot [Fri, 12 Jan 2018 22:12:39 +0000 (22:12 +0000)]
Merge "android.os.VintfObject: update for VNDK version format change."
Joseph Pirozzo [Fri, 12 Jan 2018 22:11:50 +0000 (22:11 +0000)]
Merge "Bluetooth in band ring"
Jeff Hamilton [Fri, 12 Jan 2018 21:43:44 +0000 (21:43 +0000)]
Merge "Minor LoadedApk refactoring." am:
6ca155f8c2
am:
e6fee297a2
Change-Id: I919f7e7e11b64f6155919f7ea631f3f6fd84ce03
Jeff Hamilton [Fri, 12 Jan 2018 21:30:13 +0000 (21:30 +0000)]
Merge "Minor LoadedApk refactoring."
am:
6ca155f8c2
Change-Id: I96fb0215bc09e2c190900be47dcca4de2c752d47
Hall Liu [Fri, 12 Jan 2018 20:56:36 +0000 (20:56 +0000)]
Merge "Use proper classloader when reading from parcel"
Treehugger Robot [Fri, 12 Jan 2018 20:52:14 +0000 (20:52 +0000)]
Merge "Minor LoadedApk refactoring."
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:42:42 +0000 (19:42 +0000)]
Merge "Add dependencies of EuiccCard." am:
90b4e47d94
am:
4f217d740a
Change-Id: I874b4244dd0c79c1bee34480c34d6ee6ac9e0855
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:36:56 +0000 (19:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager" am:
22f4a681f9 -s ours
am:
1ac5184053
Change-Id: I9dc40770783686b9b3db57275c8a1bbab97a7a9a
Holly Jiuyu Sun [Fri, 12 Jan 2018 19:27:22 +0000 (19:27 +0000)]
Merge "Add dependencies of EuiccCard."
am:
90b4e47d94
Change-Id: I68393a909c22a49a3905dd2b50577c4c88655ca1
Badhri Jagan Sridharan [Fri, 12 Jan 2018 19:22:13 +0000 (19:22 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
am:
22f4a681f9 -s ours
Change-Id: I8fdb25956710600d75a0f2eb0bbf82a94fc78131
Jack Yu [Thu, 11 Jan 2018 20:44:07 +0000 (12:44 -0800)]
Used LinkAddress insteaad of InterfaceAddress
Also removed InterfaceAddress which was added
in aosp/561351 since LinkAddress is exactly same
as InterfaceAddress.
Test: Telephony sanity tests
bug:
64132030
Merged-In: Ib7965a44b307c4cff2581abf0b7c12fcb1b9526a
Change-Id: Ib7965a44b307c4cff2581abf0b7c12fcb1b9526a
Jeff Hamilton [Tue, 24 Oct 2017 19:20:43 +0000 (15:20 -0400)]
Minor LoadedApk refactoring.
- Rename varaibles holding LoadedApk to make the code easier to read.
- Move resource creation into LoadedApk, consolidating the logic.
(cherry picked from commit
7541ca4d1aa48e3110187a83a8dccbfa72084148)
Test: manual
Merged-In: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Change-Id: I6bdc70482fbbb346ff694ada528ded18d3a63ef7
Sanket Padawe [Fri, 5 Jan 2018 22:26:16 +0000 (14:26 -0800)]
Add permission check for old call handover apis.
Bug:
65415068
Test: manual
Change-Id: I4784debf1be255de24c341fe5474fc529bc1cebe
Holly Jiuyu Sun [Fri, 12 Jan 2018 17:18:03 +0000 (17:18 +0000)]
Merge "Add dependencies of EuiccCard."
Paul Duffin [Thu, 16 Nov 2017 15:53:09 +0000 (15:53 +0000)]
Added new android.test.base targets
Renames ...-legacy-test-... targets related to stubs generation to
...-android-test-base-....
(cherry picked from commit
5c99382a1995723637814221cd5432c458c622ad)
Bug:
30188076
Test: make checkbuild
Change-Id: I40b39c5250b7d990a903052c0b1ebd694242b5b3
Merged-Id: I54204733612d6d3f14dd8023973e993a5ddab51d
Paul Duffin [Thu, 16 Nov 2017 15:47:05 +0000 (15:47 +0000)]
Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.
(cherry picked from commit
f779efd62cd579f67bd3b387d59fda11ee0cbe90)
Bug:
30188076
Test: make checkbuild
Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25
Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
Badhri Jagan Sridharan [Fri, 12 Jan 2018 15:36:08 +0000 (15:36 +0000)]
Merge "DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager"
Jerry Zhang [Fri, 1 Dec 2017 03:10:55 +0000 (19:10 -0800)]
DO NOT MERGE: Add setScreenUnlockedFunctions method to UsbManager
Cherry-pick from
30b9adfad1c5055044f0b585782b10f764e0ddf9
The screen unlocked functions save effort on setting
the usb config during each connection. These
functions persist between connections and between
boots. When the screen is unlocked and these
functions are set, the current functions will
be automatically set to the screen unlocked functions.
Also added svc command for this so it can be
used and tested while the UI is worked on.
Bug:
62876645
Test: svc usb setScreenUnlockedFunctions mtp
Test: Test functions with locking, unlocking, and
disconnecting, with no lockscreen, swipe, and pattern
Change-Id: Ia05e095917166d25398c4d310b02971e3a1bb12a
Sami Kyostila [Fri, 12 Jan 2018 14:47:24 +0000 (14:47 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint" am:
f0561142f3
am:
8f919b8c5b
Change-Id: Ic8e741ec39fc83cdd64ce313d5d66fdbaa1e7ebc
Sami Kyostila [Fri, 12 Jan 2018 14:16:10 +0000 (14:16 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
am:
f0561142f3
Change-Id: I4c707c676f03048b9130b140c25b3b9c58ec06ce
Treehugger Robot [Fri, 12 Jan 2018 12:39:35 +0000 (12:39 +0000)]
Merge "base: Convert libs/services/Android.mk into a blueprint"
Sami Kyostila [Thu, 11 Jan 2018 00:12:14 +0000 (00:12 +0000)]
base: Convert libs/services/Android.mk into a blueprint
Convert libs/services/Android.mk into a blueprint module so it can be
linked by other blueprint modules.
Test: mmm frameworks/base
Change-Id: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Merged-In: I7acf9aa084d262a5aba5a58e45d9647e15c6dffb
Chalard Jean [Fri, 12 Jan 2018 08:46:39 +0000 (08:46 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes" am:
2fef505e1e
am:
a3373bd461
Change-Id: Ie8d38267581ab3e1bdf4b5373487a2375f8649ed
Chalard Jean [Fri, 12 Jan 2018 08:32:34 +0000 (08:32 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
am:
2fef505e1e
Change-Id: I10be317ba9e6ac1fc6c30eda3db2c3b6b4adabe0
Hyunyoung Song [Fri, 12 Jan 2018 05:55:42 +0000 (05:55 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607 am:
69d240d584
am:
3aab9561b2
Change-Id: I554c6f320ec32b0151097701a5ff3a8d48161d7f
Hyunyoung Song [Fri, 12 Jan 2018 05:44:25 +0000 (05:44 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev am:
48df033607
am:
69d240d584
Change-Id: I02bf540b41fd9fd026fbe0fad4069526664cd56f
Hyunyoung Song [Fri, 12 Jan 2018 05:31:38 +0000 (05:31 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
am:
48df033607
Change-Id: Id2510b388bf4ed9cdd8853bc5594349df358f465
TreeHugger Robot [Fri, 12 Jan 2018 05:23:45 +0000 (05:23 +0000)]
Merge "Wrap StackOverflowError in NotFoundException. Bug:
67462465 Bug:
66498711 Test: builds and tested using faulty apk with recursive drawable. Change-Id: I47691343dae892beb5ed8c1c66c33edefade321e (cherry picked from commit
dc92d925d819d2c385c04e49369e8574fa111d14)" into oc-dev
Chalard Jean [Fri, 12 Jan 2018 05:11:29 +0000 (05:11 +0000)]
Merge "Readability improvements to the Vpn class with no logic changes"
Andreas Gampe [Fri, 12 Jan 2018 02:42:43 +0000 (02:42 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate" am:
5edae415b0
am:
75dc3e9cf4
Change-Id: Ifbe406bda739b3689ca9ed95493a8eca7a9276ae
Andreas Gampe [Fri, 12 Jan 2018 02:32:15 +0000 (02:32 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
am:
5edae415b0
Change-Id: Idef313e1a0c1a69434783da2441a84aa6e12409e
Jerry Zhang [Fri, 12 Jan 2018 01:48:01 +0000 (01:48 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver" am:
68ad3d119c -s ours
am:
da57c7d0e9
Change-Id: Ifaab0c2d5265ccfd148edbc77668c67724de915e
Jerry Zhang [Fri, 12 Jan 2018 01:32:14 +0000 (01:32 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
am:
68ad3d119c -s ours
Change-Id: Icbc53b1d1c65b60dd128f4d3f3b4e59367f4a3a1
Hall Liu [Fri, 12 Jan 2018 01:23:40 +0000 (17:23 -0800)]
Use proper classloader when reading from parcel
Use the proper classloader when loading ImsStreamMediaProfile from a
parcel.
Bug:
71873453
Test: manual
Change-Id: Idf60f18b5d25b4c8eae225cb92a5391303c86d3b
Amit Mahajan [Fri, 12 Jan 2018 00:01:33 +0000 (00:01 +0000)]
Merge "Add new config for number of physical SIM slots on the device." am:
61fa313810
am:
6d9869afad
Change-Id: Ifed6cc6b982f322a479882b6465d1b473faaee65
Treehugger Robot [Thu, 11 Jan 2018 23:52:46 +0000 (23:52 +0000)]
Merge "Frameworks: Move SharedPreferencesImpl to tristate"
Jerry Zhang [Thu, 11 Jan 2018 23:50:34 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: Add ScreenObserver"
Amit Mahajan [Thu, 11 Jan 2018 23:50:28 +0000 (23:50 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
am:
61fa313810
Change-Id: I85e549568fd7e6cd2397d2162e53308b89f7c1b0
Holly Jiuyu Sun [Thu, 11 Jan 2018 23:11:05 +0000 (23:11 +0000)]
Merge "Add EuiccCardManager and EuiccCardController." am:
ec25ea1520
am:
edc14bd3c4
Change-Id: I5ac16981ac7ca4d492387a340f10a34b8ab1d804
Yifan Hong [Thu, 11 Jan 2018 00:04:18 +0000 (16:04 -0800)]
android.os.VintfObject: update for VNDK version format change.
Test: CTS device info collect
Bug:
36400653
Change-Id: I7b22f82ddd9ddc3b0930b5c1564435c42be2a6fa
Selim Gurun [Thu, 11 Jan 2018 23:02:45 +0000 (23:02 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api" am:
ff9bc3a88c
am:
6dc20d40fd
Change-Id: Ic7d15fe855d7e3e6b3c9444e0641e2e141181154
Holly Jiuyu Sun [Thu, 11 Jan 2018 22:57:10 +0000 (22:57 +0000)]
Merge "Add EuiccCardManager and EuiccCardController."
am:
ec25ea1520
Change-Id: I2969dfc9d6b7b46d0747b18f8c3675d30fce2710
Selim Gurun [Thu, 11 Jan 2018 22:53:31 +0000 (22:53 +0000)]
Merge "Make Bluetooth constants used by gmscore a system api"
am:
ff9bc3a88c
Change-Id: If88978450234f119845a2e035fe31978e25a0189
Treehugger Robot [Thu, 11 Jan 2018 22:43:10 +0000 (22:43 +0000)]
Merge "Add new config for number of physical SIM slots on the device."
Joseph Pirozzo [Wed, 3 Jan 2018 00:15:23 +0000 (16:15 -0800)]
Bluetooth in band ring
Prevent the telecom service from generating a ringer if there is already
a ringer generated by a phone connected over bluetooth headset client
service.
Bug:
65673832
Test: runtest telecom-unit -c
com.android.server.telecom.tests.RingerTest
Change-Id: I40710787cab0215f0456153a3557aa8cf1a50cdf
(cherry picked from commit
40ea5eea4194f56f63e6aa3383772f462306c02a)
Greg Hackmann [Thu, 11 Jan 2018 21:04:54 +0000 (21:04 +0000)]
Merge "PaintMeasureTextTest: only pause/resume not_cached benchmarks" into oc-mr1-dev
am:
f523fe4fa7
Change-Id: Ic4f2a05791a9ae375bc0acb220c48e78f7d6cea1
Badhri Jagan Sridharan [Thu, 11 Jan 2018 20:57:26 +0000 (20:57 +0000)]
Merge "Overcome disconnect during oem override" am:
5e093d997a
am:
961cc1867b
Change-Id: I2e34b0795448cee1aca306202f61e491c80bd78e