OSDN Git Service
Android Build Merger (Role) [Thu, 25 Jan 2018 22:13:13 +0000 (22:13 +0000)]
Merge "Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98 am:
ebc0afd811" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 25 Jan 2018 22:10:31 +0000 (22:10 +0000)]
Merge changes from topic "am-
8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus-aosp
* changes:
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac am:
38508aeaf5
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours am:
ea52aec628 -s ours
Andreas Gampe [Thu, 25 Jan 2018 22:10:27 +0000 (22:10 +0000)]
Merge "ActivityManager: Add support for agents on startup" am:
d5cba89b98
am:
ebc0afd811
Change-Id: Ie8b991014a43ca4fba83aeab3ba826996d2813df
Android Build Merger (Role) [Thu, 25 Jan 2018 22:08:51 +0000 (22:08 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa am:
981bc5a1ac
am:
38508aeaf5
Change-Id: Icf34d805cfd9274e1d00dd35b4db8afa1356742b
Holly Jiuyu Sun [Thu, 25 Jan 2018 22:06:08 +0000 (22:06 +0000)]
Merge "Fill in methods in EuiccCardController." am:
197f072da2
am:
d143bb628a
Change-Id: I327158452fb1fc341de7a31c9004aa757406d9bd
Android Build Merger (Role) [Thu, 25 Jan 2018 22:02:48 +0000 (22:02 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours am:
cd4371f3cc -s ours
am:
ea52aec628 -s ours
Change-Id: I3afa944070a378a25dd38551cfd02e397ec7f298
Android Build Merger (Role) [Thu, 25 Jan 2018 21:56:08 +0000 (21:56 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae am:
6c1ecb973c
am:
876a1f75a3
Change-Id: I0310d50282b343261575d20cda3536667c8478b9
Android Build Merger (Role) [Thu, 25 Jan 2018 21:53:50 +0000 (21:53 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev am:
806b4573aa
am:
981bc5a1ac
Change-Id: I2a52f4b62e872e32d07e0e994c90282fa20bc946
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:53 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours am:
114cd10ac9 -s ours
am:
78578a1294 -s ours
Change-Id: I39d1e16f34fea09009c039a955040e811988d422
Andreas Gampe [Thu, 25 Jan 2018 21:50:42 +0000 (21:50 +0000)]
Merge "ActivityManager: Add support for agents on startup"
am:
d5cba89b98
Change-Id: Iee82ac1a08183857ea4fcf2d67b99dede5d5a2ae
Android Build Merger (Role) [Thu, 25 Jan 2018 21:50:18 +0000 (21:50 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb am:
0a09cd4b21 -s ours
am:
cd4371f3cc -s ours
Change-Id: Ie76e94193cbb2c18fbe4d481b8b4bd0b44648488
Holly Jiuyu Sun [Thu, 25 Jan 2018 21:47:46 +0000 (21:47 +0000)]
Merge "Fill in methods in EuiccCardController."
am:
197f072da2
Change-Id: I9d8db8ef23c7a469b38748ba8fd4b3a91ca4506e
Android Build Merger (Role) [Thu, 25 Jan 2018 21:46:22 +0000 (21:46 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
am:
806b4573aa
Change-Id: I1cfe38aa5a80dd142ef80375957766ce6b8daf99
Android Build Merger (Role) [Thu, 25 Jan 2018 21:45:31 +0000 (21:45 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
am:
0a09cd4b21 -s ours
Change-Id: I939c7d74e9c575b6ed205dc5713579bb03cb31d5
Android Build Merger (Role) [Thu, 25 Jan 2018 19:25:06 +0000 (19:25 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev am:
41ae4b7eae
am:
6c1ecb973c
Change-Id: Ie305f8b8f404f9dcf19f53d51fca7eafed03faaa
Android Build Merger (Role) [Thu, 25 Jan 2018 19:23:56 +0000 (19:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours am:
fa70de88c5 -s ours
am:
b8bc53ecc3 -s ours
Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b
Android Build Merger (Role) [Thu, 25 Jan 2018 19:21:27 +0000 (19:21 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0 am:
77243e2d28 -s ours
am:
114cd10ac9 -s ours
Change-Id: Ia0342f04f3fca736521746aa7008bd40d84f0d1f
Android Build Merger (Role) [Thu, 25 Jan 2018 19:14:57 +0000 (19:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93 am:
19f08130b1 -s ours
am:
fa70de88c5 -s ours
Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:52 +0000 (19:09 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
am:
41ae4b7eae
Change-Id: Ic40433dd8e426ee0b13cfd04c218e84d5a089bef
Android Build Merger (Role) [Thu, 25 Jan 2018 19:09:05 +0000 (19:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
am:
77243e2d28 -s ours
Change-Id: I51635f606e53d517a340e656fd28bf3be58e7acd
Android Build Merger (Role) [Thu, 25 Jan 2018 19:04:31 +0000 (19:04 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93
am:
19f08130b1 -s ours
Change-Id: I8a06155e0f3d7e4d50f295712ef4ab120ec6d92c
TreeHugger Robot [Thu, 25 Jan 2018 18:44:49 +0000 (18:44 +0000)]
Merge changes from topic "am-
459a2298-9d91-42be-bcee-
e19446619a42" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Import translations. DO NOT MERGE
TreeHugger Robot [Thu, 25 Jan 2018 18:40:29 +0000 (18:40 +0000)]
Merge changes from topic "am-
3ca94091-64c7-4524-a9e7-
1438a5fc6599" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Import translations. DO NOT MERGE
Treehugger Robot [Thu, 25 Jan 2018 18:08:07 +0000 (18:08 +0000)]
Merge "ActivityManager: Add support for agents on startup"
Holly Jiuyu Sun [Thu, 25 Jan 2018 17:22:50 +0000 (17:22 +0000)]
Merge "Fill in methods in EuiccCardController."
Andreas Gampe [Thu, 25 Jan 2018 16:10:00 +0000 (16:10 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test" am:
ffcf3ff77d
am:
57f653a155
Change-Id: I03dee58beeb6247a7786fef455eae646fb243121
Andreas Gampe [Thu, 25 Jan 2018 15:53:05 +0000 (15:53 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test"
am:
ffcf3ff77d
Change-Id: I4c803259d993c51790c4b960251dde3a2bea9db9
Eric Schwarzenbach [Thu, 25 Jan 2018 15:49:59 +0000 (15:49 +0000)]
Merge "Update CellInfo API to accomodate new fields." am:
7e73c73f89
am:
4dac182030
Change-Id: Ifef2f68a49fb74c11fb845590e08040972f7d27b
David Brazdil [Thu, 25 Jan 2018 15:33:47 +0000 (15:33 +0000)]
Merge "Create hidden API lists" am:
b6a5c92b50
am:
265863f9d9
Change-Id: I4d32dccc7c00216102b6bd91ed1f185c03c2c048
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:48 +0000 (15:23 +0000)]
Merge "Add ServiceState APIs for carrier aggregation." am:
185a89caf1
am:
d529242eea
Change-Id: Id55c68bed1fceff1d6d83793b190188b42d99435
Eric Schwarzenbach [Thu, 25 Jan 2018 15:23:20 +0000 (15:23 +0000)]
Merge "Update CellInfo API to accomodate new fields."
am:
7e73c73f89
Change-Id: Ib82c77d3b5559d593dbb3181add634eee251f53b
Malcolm Chen [Thu, 25 Jan 2018 15:19:06 +0000 (15:19 +0000)]
Merge "Add slotId in INetworkService.aidl methods." am:
b1c6aa4567
am:
9348e258cd
Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e
David Brazdil [Thu, 25 Jan 2018 15:14:58 +0000 (15:14 +0000)]
Merge "Create hidden API lists"
am:
b6a5c92b50
Change-Id: I176c79560b1cc74182de4cf080b105fc91afce22
Eric Schwarzenbach [Thu, 25 Jan 2018 15:09:59 +0000 (15:09 +0000)]
Merge "Add ServiceState APIs for carrier aggregation."
am:
185a89caf1
Change-Id: I15e52f02c204805efacbd22eaad9a1e7218ff3ca
Malcolm Chen [Thu, 25 Jan 2018 15:06:59 +0000 (15:06 +0000)]
Merge "Add slotId in INetworkService.aidl methods."
am:
b1c6aa4567
Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202
Treehugger Robot [Thu, 25 Jan 2018 15:05:27 +0000 (15:05 +0000)]
Merge "PrintSpooler: Fix EqualsNaN in test"
Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:13 +0000 (14:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb skipped:
10f8c984c0
Change-Id: I4a8b6d977c11f57303700d60526707b632a7c403
Android Build Merger (Role) [Thu, 25 Jan 2018 14:23:07 +0000 (14:23 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
9a738cccdb
Change-Id: Iae0ea1e87448360321f506ca698d19b5b7812498
Bill Yi [Thu, 25 Jan 2018 14:22:37 +0000 (06:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie4fc80ab24fb6a8f3272a6540e6d93d26b7d5496
Auto-generated-cl: translation import
Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:09 +0000 (13:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01 skipped:
03130e4fbb
Change-Id: Id7171c69c55a042c6ac6cad743a23960591b9e86
Android Build Merger (Role) [Thu, 25 Jan 2018 13:13:01 +0000 (13:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4cd0777c01
Change-Id: I697689c9d02095934f558b3b2ce3786170b25305
Bill Yi [Thu, 25 Jan 2018 13:12:24 +0000 (05:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibd7d5723c9c4cdc09efcb30f604ff43a096c5da1
Auto-generated-cl: translation import
Treehugger Robot [Thu, 25 Jan 2018 12:50:37 +0000 (12:50 +0000)]
Merge "Update CellInfo API to accomodate new fields."
Android Build Merger (Role) [Thu, 25 Jan 2018 12:17:01 +0000 (12:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486 skipped:
a14fb25f93
Change-Id: I93cffeeef1826f04ff75bd61c9fcacbfcfc8668c
Android Build Merger (Role) [Thu, 25 Jan 2018 12:16:54 +0000 (12:16 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
e34cac0486
Change-Id: I45a61272bb4c3ca3a67210778f6fd7ff65553f99
Bill Yi [Thu, 25 Jan 2018 12:16:22 +0000 (04:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3040ff1778e9dc85cc004396ec70bf272d73c0f5
Auto-generated-cl: translation import
David Brazdil [Thu, 25 Jan 2018 07:55:35 +0000 (07:55 +0000)]
Merge "Create hidden API lists"
nharold [Thu, 25 Jan 2018 07:49:59 +0000 (07:49 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder" am:
af3fb3efe4
am:
bbb4b05a64
Change-Id: I383aa402d9d570ee7c7d5a603d022d1dade267a5
Treehugger Robot [Thu, 25 Jan 2018 07:47:55 +0000 (07:47 +0000)]
Merge "Add ServiceState APIs for carrier aggregation."
Chalard Jean [Thu, 25 Jan 2018 07:41:44 +0000 (07:41 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down" am:
a8452ed2a6
am:
806f0191d4
Change-Id: Ifd63fdf47348dc3a1c1871deacc61470784bdbb6
nharold [Thu, 25 Jan 2018 07:37:00 +0000 (07:37 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
am:
af3fb3efe4
Change-Id: I5ef319815e27c321ce4fee0cb671f16372e9a604
Chalard Jean [Thu, 25 Jan 2018 07:33:35 +0000 (07:33 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
am:
a8452ed2a6
Change-Id: Ic37c9f60448b10c861a78848bed18ebd4e0ad910
Eric Schwarzenbach [Wed, 10 Jan 2018 19:33:52 +0000 (11:33 -0800)]
Update CellInfo API to accomodate new fields.
Adds CellConnectionStatus to top level CellInfo type. Adds cell bandwidth
to the CellIdentityLte.
Bug:
72117223
Test: runtest frameworks-telephony
Change-Id: Id5f3b5a2bd4119c099f5e739d5579974e7adc897
Treehugger Robot [Thu, 25 Jan 2018 07:13:17 +0000 (07:13 +0000)]
Merge "Add slotId in INetworkService.aidl methods."
nharold [Thu, 25 Jan 2018 05:50:33 +0000 (05:50 +0000)]
Merge "Move Keepalive out of IpSecTransform.Builder"
Chalard Jean [Thu, 25 Jan 2018 05:37:21 +0000 (05:37 +0000)]
Merge "Fix a bug where a NetworkAgent gets repeatedly torn down"
Andreas Gampe [Thu, 25 Jan 2018 02:37:07 +0000 (18:37 -0800)]
PrintSpooler: Fix EqualsNaN in test
Fix NaN comparisons in WorkflowTest.
Bug:
72451126
Test: m javac-check RUN_ERROR_PRONE=true
Merged-In: I3eba48ac3f8dc343cd22cac0f9fbf4d4e6c76631
Change-Id: I19db273ee442c912c2c1052d53b5b2e0c5cd968b
Chalard Jean [Thu, 25 Jan 2018 00:41:51 +0000 (09:41 +0900)]
Fix a bug where a NetworkAgent gets repeatedly torn down
mUids is not marshalled correctly when null so if the
NetworkAgent runs in another process and is not a VPN then
the system will see its allowed Uids as being the empty
list (= nobody can use this network) instead of a null
list (= everybody can use this network). This breaks
emulator networking.
Bug:
72436966
Test: runtests frameworks-net
Test: also manual testing, this does fix emulator networking
and seems not to break phone networking
Change-Id: Id2bbf3808e80b19cd055c832c11cf72372710942
Jeremy Klein [Thu, 25 Jan 2018 03:44:46 +0000 (03:44 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning." am:
f4dc715575
am:
4c2c7bedf9
Change-Id: I5d214df392ed17c7de0456f535f9b550485c8fc2
Jeremy Klein [Thu, 25 Jan 2018 03:35:06 +0000 (03:35 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
am:
f4dc715575
Change-Id: I1f603f966aeb5d828746969295f51e2f01096bc4
Jun Yin [Thu, 25 Jan 2018 03:34:13 +0000 (03:34 +0000)]
Merge "Adds stripTrailingFs" am:
27bb333e14
am:
a91491a3b8
Change-Id: I6b850d252fb40395bc312f4ed8be383153af52ef
Nathan Harold [Thu, 7 Dec 2017 03:12:28 +0000 (19:12 -0800)]
Move Keepalive out of IpSecTransform.Builder
The lifecycle of Keepalive offloading is, unfortunately
different from that of an IpSecTransform. Because starting
a keepalive is fundamentally asynchronous, and isn't valid
until after a transform exists, it will now be a separate
optional procedure that may succeed or fail. It remains
linked with a Transform by the need for a Transform to exist
in order to initiate a Keepalive.
Bug:
38350389
Test: compilation
Change-Id: Ia76fccee41f86d694dff436043293d0c0762c041
Jun Yin [Thu, 25 Jan 2018 03:27:05 +0000 (03:27 +0000)]
Merge "Adds stripTrailingFs"
am:
27bb333e14
Change-Id: I355be2bb0b23e69103edc073ffe3adb757e57aa9
Treehugger Robot [Thu, 25 Jan 2018 03:09:27 +0000 (03:09 +0000)]
Merge "Add FLAG_ACTIVITY_NEW_TASK when starting UI-based tether provisioning."
Amit Mahajan [Thu, 25 Jan 2018 02:59:04 +0000 (02:59 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED." am:
7b9a785d65
am:
e2075c2c7d
Change-Id: Ib3e807a900fcc548e88f10b4622e8203fe6d72be
Andreas Gampe [Thu, 25 Jan 2018 02:48:37 +0000 (02:48 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning" am:
25e50ccccb
am:
822e828971
Change-Id: I0481e40c91e5848fc7ab551a794269d9379cbcc9
Treehugger Robot [Thu, 25 Jan 2018 02:44:26 +0000 (02:44 +0000)]
Merge "Adds stripTrailingFs"
Amit Mahajan [Thu, 25 Jan 2018 02:44:09 +0000 (02:44 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
am:
7b9a785d65
Change-Id: I3f329aea9d90ced822c119f079d0a70a562f44a3
Andreas Gampe [Thu, 25 Jan 2018 02:40:28 +0000 (02:40 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
am:
25e50ccccb
Change-Id: I085cfc11effb8f067bd8fc122ec88bd6c44a2525
Holly Jiuyu Sun [Thu, 18 Jan 2018 23:16:31 +0000 (15:16 -0800)]
Fill in methods in EuiccCardController.
Add RESULT_UNKNOWN in EuiccCardManager.
Bug:
38206971
Test: test on phone
Change-Id: I972ba0ab5ff6bb8e6ef50c8684a19bb9cd48a721
Andreas Gampe [Mon, 22 Jan 2018 23:15:54 +0000 (15:15 -0800)]
ActivityManager: Add support for agents on startup
Add setAgentApp similar to setDebugApp. If given, attempt to attach the given
agent during handleBindApplication.
The flow needed a slight refactor. It is not possible to do a debuggability
check at setAgentApp time (without checking all installed apps). Instead,
when a ProfilerInfo contains an agent, perform a debuggability check then.
This is consistent with how setDebugApp works.
Expose through the shell command:
cmd activity set-agent-app process agent
Add CTS coverage.
Bug:
69929492
Test: m
Test: m cts
Test: cts-tradefed run commandAndExit cts-dev -m CtsJvmtiAttachingHostTestCases
Change-Id: I65e869debd45e6073f9ab21cb9de9c9deb828a2e
Malcolm Chen [Wed, 24 Jan 2018 01:35:51 +0000 (17:35 -0800)]
Add slotId in INetworkService.aidl methods.
Since one Service can only return same binder to all connected
clients, we add slotId in INetworkService.aidl methods to redirect
requests to correct provider.
Bug:
64132030
Test: build
Change-Id: Iae5d81a689a43ed783d7dff0f51735c42a6483be
Treehugger Robot [Thu, 25 Jan 2018 01:33:33 +0000 (01:33 +0000)]
Merge "Update comments for ACTION_CARRIER_CONFIG_CHANGED."
David Brazdil [Thu, 25 Jan 2018 01:12:33 +0000 (01:12 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps" am:
50cfaa40ca
am:
97a970e56b
Change-Id: I73eaa052597d225aa673dd479977b0ce7a7d6d64
Eric Schwarzenbach [Thu, 18 Jan 2018 22:42:00 +0000 (14:42 -0800)]
Add ServiceState APIs for carrier aggregation.
Adds getDuplexMode, getChannelNumber, and getCellBandwidths to
ServiceState.
Bug:
72117602
Test: runtest
Change-Id: I04be7d0a7d88693ef21b252ecc21aa974c2f89c8
David Brazdil [Thu, 25 Jan 2018 01:06:15 +0000 (01:06 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
am:
50cfaa40ca
Change-Id: I7aa3c86bae54b4f55cbb5cfe8ddf076fedf6177b
Andreas Gampe [Thu, 25 Jan 2018 00:56:11 +0000 (00:56 +0000)]
Merge "BitmapDrawable: Suppress errorprone warning"
Jeremy Klein [Wed, 24 Jan 2018 23:34:38 +0000 (23:34 +0000)]
Merge "Add scan interval and window lengths to Settings.Global." am:
d3dac85e46
am:
8c33c789ed
Change-Id: Ib86750eadcf5683faba4151e3f3373f04a387de1
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:24:29 +0000 (23:24 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am:
ec44a402d2
am:
596c22a84d
Change-Id: I6320f2195eeb2221fb29778b6171c3ebdb3f8dac
Pankaj Kanwar [Wed, 24 Jan 2018 23:14:30 +0000 (23:14 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
am:
e2bc2efe3c
Change-Id: Ie1366ad3364176dce6a5f7b5a78a19b7806030cd
Jeremy Klein [Wed, 24 Jan 2018 23:13:31 +0000 (23:13 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
am:
d3dac85e46
Change-Id: Ibae30208c4f0f2ad8bf8e508778d73f0883ef42e
Treehugger Robot [Wed, 24 Jan 2018 23:09:28 +0000 (23:09 +0000)]
Merge "Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps"
Holly Jiuyu Sun [Wed, 24 Jan 2018 23:05:25 +0000 (23:05 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
am:
ec44a402d2
Change-Id: I6ded59329716f073b30964940ab6574360406778
Pankaj Kanwar [Wed, 24 Jan 2018 23:02:22 +0000 (23:02 +0000)]
Merge "Metrics wifi.proto for connected wifi score" into oc-mr1-dev
Amit Mahajan [Wed, 24 Jan 2018 20:54:44 +0000 (12:54 -0800)]
Update comments for ACTION_CARRIER_CONFIG_CHANGED.
Test: none
Bug:
64131518
Change-Id: I7efbbb393289cc11d529898ea3d7f96b0e89f445
Treehugger Robot [Wed, 24 Jan 2018 21:49:00 +0000 (21:49 +0000)]
Merge "Add scan interval and window lengths to Settings.Global."
David Brazdil [Wed, 24 Jan 2018 21:43:47 +0000 (21:43 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps" am:
2a8c24be18
am:
6dea42ae0f
Change-Id: I6376e610c575cd7c3f7bf8a72ca4c1a92d9023cc
David Brazdil [Wed, 17 Jan 2018 18:06:47 +0000 (18:06 +0000)]
Set Zygote.DISABLE_HIDDEN_API_CHECKS for system apps
When forking a process for a system app, pass a flag to ART that
will disable enforcement of hidden API access checks.
Test: manual
Bug:
64382372
Change-Id: I5ba81d84a44c9467613f060428b11e1d9d725bd3
David Brazdil [Wed, 24 Jan 2018 21:36:44 +0000 (21:36 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
am:
2a8c24be18
Change-Id: I51ce5aa51ca72200639244caa018323911cc54ae
Andreas Gampe [Wed, 24 Jan 2018 21:25:22 +0000 (13:25 -0800)]
BitmapDrawable: Suppress errorprone warning
Suppress a warning for constructor-chaining not using all parameters.
Bug:
72451126
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: Ie47dec119ec578b79d866d9c5041bb7b68eac146
Holly Jiuyu Sun [Wed, 24 Jan 2018 21:11:07 +0000 (21:11 +0000)]
Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."""
Tyler Gunn [Wed, 24 Jan 2018 21:06:48 +0000 (21:06 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario." am:
7a481bde6d
am:
f343e33dd5
Change-Id: Ia3e538e18d4fdf1770ee15b06d256c6e79051ebf
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:55:01 +0000 (20:55 +0000)]
Merge "Added network service interface" am:
71793be6bb
am:
2b06789511
Change-Id: I88aeed6b03d39e7555ad9de62b954eac62da3f79
Tyler Gunn [Wed, 24 Jan 2018 20:48:55 +0000 (20:48 +0000)]
Merge "Add new IMS reasoninfo to handle alternate emergency disconnect scenario."
am:
7a481bde6d
Change-Id: I7d9f84b2240b1c961675b6ab6937dc952f44bd2d
David Brazdil [Mon, 22 Jan 2018 22:23:13 +0000 (22:23 +0000)]
Create hidden API lists
Android is beginning to put restrictions on the usage of private APIs.
In order to facilitate a transitionary period, some APIs will remain
accessible but issue a warning (greylist), other will see restrictions
right away (blacklist).
This patch create two new text files which will be used to store manual
lists of dex signatures of hidden APIs. These are the blacklist and
dark greylist. They should be mutually exclusive and both be subsets of
INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE. The last list, light greylist,
is generated as INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE minus the two
manual lists.
Bug:
64382372
Test: m
Change-Id: Ia694ef79bece819c87db853ccaea5e95f38d3e84
Xiangyu/Malcolm Chen [Wed, 24 Jan 2018 20:44:04 +0000 (20:44 +0000)]
Merge "Added network service interface"
am:
71793be6bb
Change-Id: I2dab9576e8fc32f914225620733ad83b7c808015
Jun Yin [Wed, 24 Jan 2018 20:13:37 +0000 (12:13 -0800)]
Adds stripTrailingFs
This function removes padding 'F' characters in a string (e.g., ICCID).
Bug:
38206971
Test: unit test in another cl
Change-Id: If77604576c5bd26404cdc436f8297191664325a4
Treehugger Robot [Wed, 24 Jan 2018 20:28:21 +0000 (20:28 +0000)]
Merge "Set DEXOPT_DISABLE_HIDDEN_API_CHECKS for system apps"
Benedict Wong [Wed, 24 Jan 2018 19:56:24 +0000 (19:56 +0000)]
Merge "Add tunnel-mode calls to netd in IpSecService" am:
475fe28c50
am:
02d6d81006
Change-Id: I8a3d16c8e58ad1c09d967943abe1c729fe37636a
Jack He [Wed, 24 Jan 2018 19:50:46 +0000 (19:50 +0000)]
Merge "BT-HFP: Update Bluetooth headset state handler to Multi-HFP" am:
0aafefb113
am:
a8505da2a6
Change-Id: Iafb904bef6c99f4c48ca9c2ef33ea4809924a4c1
OSDN Git Service
