OSDN Git Service
TreeHugger Robot [Fri, 16 Feb 2018 00:10:35 +0000 (00:10 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." into oc-mr1-dev-plus-aosp
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 23:50:31 +0000 (23:50 +0000)]
Merge "Add NetworkRegistrationState into SS's list." am:
9f92ed943c
am:
6576ed3d5b
Change-Id: I02efc2c7dceb775a5ce2eb3e3f2696e098cef046
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 23:39:01 +0000 (23:39 +0000)]
Merge "Add NetworkRegistrationState into SS's list."
am:
9f92ed943c
Change-Id: I4c99214c0f8a2561795cd320f8ff87c072a7a9bd
Brad Ebinger [Thu, 15 Feb 2018 21:46:48 +0000 (21:46 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files." am:
1da6f542ef
am:
fee59fac7b
Change-Id: Ieb1f9465eaec47f51d3e62a15c7d4f6fd0970dd0
Calin Juravle [Thu, 15 Feb 2018 21:30:27 +0000 (21:30 +0000)]
Merge changes from topic "cp_calin_framework_2017" am:
b98102b4dc
am:
b3da44d9a1
Change-Id: Ibd848f6803d63da46ae1461b469422c5a6431980
Brad Ebinger [Thu, 15 Feb 2018 21:22:40 +0000 (21:22 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files."
am:
1da6f542ef
Change-Id: I8d07cde7cc41393799228b1af49ee460e9cebd15
Calin Juravle [Thu, 15 Feb 2018 20:46:22 +0000 (20:46 +0000)]
Merge changes from topic "cp_calin_framework_2017"
am:
b98102b4dc
Change-Id: I524b166fbd551200a539a40e3531883b494f68db
Xiangyu/Malcolm Chen [Thu, 15 Feb 2018 19:01:59 +0000 (19:01 +0000)]
Merge "Add NetworkRegistrationState into SS's list."
Brad Ebinger [Thu, 15 Feb 2018 17:23:31 +0000 (17:23 +0000)]
Merge "Add new owners files for Telephony/Telecom frameworks files."
Treehugger Robot [Thu, 15 Feb 2018 16:17:06 +0000 (16:17 +0000)]
Merge changes from topic "cp_calin_framework_2017"
* changes:
Allow public profile compilation for primary apks
[framework] Pass .dm files to dexopt at install time
Extend the ArtManager profiling API to cover boot image profiling
[framework] Extend profile operations to take the profile name
Accept UserHandle.USER_ALL during profile preparation
[framework] Prepare profile for app code paths
Perform a non strict matching of .dm files when computing the size
Support installation of DexMetadata files (.dm)
Rename snapshotProfile to createProfileSnapshot for consistency
Implement ArtManager#snapshotProfile API
Add SystemApis to expose runtime profile information
Log SHA256 of secondary dex files during reconcile.
David Brazdil [Thu, 15 Feb 2018 13:14:49 +0000 (13:14 +0000)]
Merge "Update hidden API toast message" am:
10034d94cf
am:
42ab3eeb4c
Change-Id: I6c82dc811f3118733d3afffa7ddb6d5016d4f075
Chalard Jean [Thu, 15 Feb 2018 13:09:26 +0000 (13:09 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119 am:
edab226d0e
am:
6fe110fa36
Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3
David Brazdil [Thu, 15 Feb 2018 13:01:54 +0000 (13:01 +0000)]
Merge "Update hidden API toast message"
am:
10034d94cf
Change-Id: I7e5c4c5333be8d1bc5722b0924c31a8ad94be29e
Chalard Jean [Thu, 15 Feb 2018 12:57:16 +0000 (12:57 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
am:
edab226d0e
Change-Id: I6ffc0a841d0aa8479bb5b6afba49c5130af879da
David Brazdil [Thu, 15 Feb 2018 11:55:15 +0000 (11:55 +0000)]
Merge "Update hidden API toast message"
Lorenzo Colitti [Thu, 15 Feb 2018 11:52:34 +0000 (11:52 +0000)]
Merge changes Icd56662d,I0ece820f am:
47ef64b0d2
am:
bf66580c0b
Change-Id: I5faf7049c376eb400a41231448d9414471ae6777
Lorenzo Colitti [Thu, 15 Feb 2018 11:43:29 +0000 (11:43 +0000)]
Merge changes Icd56662d,I0ece820f
am:
47ef64b0d2
Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c
Chalard Jean [Thu, 15 Feb 2018 11:25:36 +0000 (11:25 +0000)]
Merge changes I3d68dbf8,I6ea524bb,I978d9119
* changes:
Deprecate CONNECTIVITY_ACTION.
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
Send null UIDs to apps instead of single-uid lists.
Lorenzo Colitti [Thu, 15 Feb 2018 10:03:26 +0000 (10:03 +0000)]
Merge changes Icd56662d,I0ece820f
* changes:
Restrict OWNERS in android.net.*
Add OWNERS to the libandroid_net library.
David Brazdil [Wed, 14 Feb 2018 22:36:34 +0000 (22:36 +0000)]
Update hidden API toast message
Change the toast message shown by an Activity when VMRuntime reports
that the app has used a private API.
(a) fix a typo: compatiblity -> compatibility
(b) change guidance from "please consult log" to "go to <url> for
more info" where devs can learn how to proceed if their app does
have compatibility issues.
Bug:
64382372
Test: make, visual
Change-Id: Idbe32a724438bb7b0826d0b4e11ef505015cb321
Lorenzo Colitti [Thu, 15 Feb 2018 07:43:44 +0000 (16:43 +0900)]
Restrict OWNERS in android.net.*
Test: None
Change-Id: Icd56662dcbc86b49015d094fd8ae2ade235aa475
Lorenzo Colitti [Thu, 15 Feb 2018 06:51:58 +0000 (15:51 +0900)]
Add OWNERS to the libandroid_net library.
Test: None
Change-Id: I0ece820fc0de786a81df9f922135acdf92f1d136
Jakub Pawlowski [Thu, 15 Feb 2018 05:49:13 +0000 (05:49 +0000)]
Merge "Hearing Aid profile" am:
aca4460b64
am:
edb16b0f4b
Change-Id: Ica92a9ffecb205f07288139970cd83f578ef7669
Jakub Pawlowski [Thu, 15 Feb 2018 05:37:45 +0000 (05:37 +0000)]
Merge "Hearing Aid profile"
am:
aca4460b64
Change-Id: I2f0367b57ec720c3b46b0f2984b77068db3fa3c1
Treehugger Robot [Thu, 15 Feb 2018 04:14:43 +0000 (04:14 +0000)]
Merge "Hearing Aid profile"
Siyamed Sinir [Thu, 15 Feb 2018 00:56:53 +0000 (00:56 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340 am:
bb0a801a85
am:
dc288fc3ec
Change-Id: I55d644d7028d7a69d8aec16c379d052608d7f336
Siyamed Sinir [Thu, 15 Feb 2018 00:43:01 +0000 (00:43 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89 am:
1fd506a340
am:
bb0a801a85
Change-Id: I872e5511439ee880f7837a06d5449f556ffb1ebc
Siyamed Sinir [Thu, 15 Feb 2018 00:31:11 +0000 (00:31 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
am:
1fd506a340
Change-Id: I882d9d4190e2f448a0595192c68ac6caf8ee4607
Tyler Gunn [Wed, 14 Feb 2018 22:37:17 +0000 (14:37 -0800)]
Add new owners files for Telephony/Telecom frameworks files.
Test: N/A
Bug:
73373651
Change-Id: Ia0e19018d6cd72923f9f20b372d303fa532409b0
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:21 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60 skipped:
aa9c801f89
Change-Id: I0d1636b652adf1db5ebd67eb9bb467d3abd84b26
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:16 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f am:
7db4a90e60
Change-Id: Ib5ae0b8558fb647407e5a836b6835e1a5d9f6753
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:11 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4 am:
fc98290b1f
Change-Id: I27c9d607c6b3b7ae5126a9bb22cdb4ea18963918
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:07 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761 am:
d57766c5b4
Change-Id: Iac5a694469e6c111f204df6c58446a45cf0ada7c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:06:02 +0000 (00:06 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35 am:
0a2ed3f761
Change-Id: Ie5d077cba11b7b9277f4fbce046e571a01535c3c
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:54 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0 skipped:
15a3e59d35
Change-Id: If169e52215ed3a3428d4ff4e834f635f7b0f30e1
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:49 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a am:
85727109f0
Change-Id: I80463ee5315c2672e812659192b227c8271e9113
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:43 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3 am:
30a705874a
Change-Id: Ic83a666bae330bea031b95233079e1493c02c9b3
Android Build Merger (Role) [Thu, 15 Feb 2018 00:05:38 +0000 (00:05 +0000)]
[automerger] DO NOT MERGE Fix mTrustManager NPE am:
a381c4ced3
Change-Id: Ib622af453781a1769e820c10d6ab46c140809c57
Malcolm Chen [Tue, 13 Feb 2018 23:42:58 +0000 (15:42 -0800)]
Add NetworkRegistrationState into SS's list.
Add hidden API to add NetworkRegistrationState into SS's
NetworkRegistrationState list.
Bug:
73305596
Test: unittest
Change-Id: Ief7f22632c1f3400c01663d13b990dc9b0d59e2e
Jakub Pawlowski [Wed, 22 Nov 2017 19:02:34 +0000 (11:02 -0800)]
Hearing Aid profile
This is implementation of Hearing Aid Profile that will in future
be connected to Bluetooth Manager - see TODOs in BluetoothHearingAid.java
Bug:
69623109
Test: compilation. Manual test with HA.
Change-Id: I79643ea1e14e9df7f5771169359c964a60c56618
Benedict Wong [Wed, 14 Feb 2018 21:25:08 +0000 (21:25 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created" am:
2c8456b22e
am:
3988c929ad
Change-Id: I041cd94be9cefc997b95478444661b557d95e3dc
Benedict Wong [Wed, 14 Feb 2018 21:14:19 +0000 (21:14 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
am:
2c8456b22e
Change-Id: I24ac6baa0492a46bf5810bc6bc146d9aaa9eccab
Chen Xu [Wed, 14 Feb 2018 21:09:29 +0000 (21:09 +0000)]
Merge "add a current table in CarrierIdProvider" am:
3fa6fe2117
am:
9fce67f50f
Change-Id: Ia8dbd47c1c4cf775f7597e7e93c8315bf004e9e0
Chen Xu [Wed, 14 Feb 2018 21:00:42 +0000 (21:00 +0000)]
Merge "add a current table in CarrierIdProvider"
am:
3fa6fe2117
Change-Id: I5e734d3b55332e5d9bb5bc27515625456edb5df5
Benedict Wong [Wed, 14 Feb 2018 19:37:53 +0000 (19:37 +0000)]
Merge "Copy IpSecConfig when IpSecTransforms are created"
Chen Xu [Wed, 14 Feb 2018 18:54:06 +0000 (18:54 +0000)]
Merge "add a current table in CarrierIdProvider"
Brad Ebinger [Fri, 9 Feb 2018 00:06:31 +0000 (16:06 -0800)]
MSIM support for hidden IMS capability and registration query APIs.
Modifies TelephonyManager APIs to better support MSIM devices
and adds a method to query MMTEL IMS Registration technology.
Test: Manual, telephony unit tests.
Bug:
35128252
Merged-In: Ie37185bd3477635094a0db998918ba5ad59842be
Change-Id: Ie37185bd3477635094a0db998918ba5ad59842be
Calin Juravle [Thu, 1 Feb 2018 17:23:13 +0000 (17:23 +0000)]
Allow public profile compilation for primary apks
It is ok to perform a "public" compilation with
profiles comming from dex metdata files.
(cherry picked from commit
ff3e4a1b2fb082e8146d00a41f702d0b00d9cab0)
Test: adb install foo.apk foo.dm
Bug:
30934496
Merged-In: I1d15e3281ccc61b19a2aafe3c885285a83ff6115
Change-Id: I1d15e3281ccc61b19a2aafe3c885285a83ff6115
Calin Juravle [Thu, 1 Feb 2018 17:20:51 +0000 (17:20 +0000)]
[framework] Pass .dm files to dexopt at install time
(cherry picked from commit
cc65194e8e5a284e915176200a846ec75c037d95)
Test: DexoptOptionsTest
adb install foo.apk foo.dm
Bug:
30934496
Merged-In: If7e705a0efc0954a385ec3bfe7a93921c0d83351
Change-Id: If7e705a0efc0954a385ec3bfe7a93921c0d83351
Calin Juravle [Mon, 22 Jan 2018 05:39:18 +0000 (21:39 -0800)]
Extend the ArtManager profiling API to cover boot image profiling
The boot image profile is available only on userdebug and eng builds and
combines the boot classpath and system server classpath.
Also, update ArtManager API to use Executors instead of Handlers.
(cherry picked from commit
fcbb74a4296fd808e1058ecebd91fac56582e799)
Test: gts GtsAndroidRuntimeManagerHostTestCases
Bug:
30934496
Merged-In: Ie501947a659d644acbde04fb46157dd0c7944e81
Change-Id: Ie501947a659d644acbde04fb46157dd0c7944e81
Calin Juravle [Sat, 20 Jan 2018 04:32:47 +0000 (20:32 -0800)]
[framework] Extend profile operations to take the profile name
Extend the installd profile interface to take the profile name as
argument. This shifts the responsibility for choosing the names of
profiles for primary apks completely to PackageManager. Each of the
application code paths will get an unique profile name based on their
split name.
All the profile operations will now work on a specific profile name rather
than assuming a default global name.
Also, move dumpProfiles and clearProfiles functionality to the
ArtManagerService so that we can re-use profileName computations easier.
(cherry picked from commit
6ae39fc2e5b4692d092a042816939fd0a5f3e3b8)
Test: manual (dexopt apps, merge profiles, clear profiles)
gts GtsAndroidRuntimeManagerHostTestCases
Bug:
30934496
Merged-In: Ie65d45eed7de0844edf4b7af918d7eaa74ec1f2c
Change-Id: Ie65d45eed7de0844edf4b7af918d7eaa74ec1f2c
Calin Juravle [Wed, 24 Jan 2018 22:43:24 +0000 (14:43 -0800)]
Accept UserHandle.USER_ALL during profile preparation
(cherry picked from commit
5bbe26ee01bc9785487fe5e748e624b6fc5bd3a4)
Test: adb install foo.apk
Bug:
72453027
Merged-In: I840d70d47a256c8853bbe1b9b023f51bdd5ddf6b
Change-Id: I840d70d47a256c8853bbe1b9b023f51bdd5ddf6b
Calin Juravle [Thu, 18 Jan 2018 23:17:29 +0000 (15:17 -0800)]
[framework] Prepare profile for app code paths
This CL is an intermediate step to enable the use of profiles shipped in
the dex metadata files.
The preparation consist of:
- creating the current profile
- merging the profile from the dex metadata file (if present) into the
reference profile
and happens:
- after the application data directory is created, to capture system
apps.
- post-install (right before we dexopt), to capture any new code paths
(cherry picked from commit
3621be71d0fe8a349ca468aca99a53a17f6575b3)
Test: manual (install apps and splits, take OTA)
Bug:
30934496
Merged-In: Id36474ab629ad3ffafd24381d30e3d88ac02d576
Change-Id: Id36474ab629ad3ffafd24381d30e3d88ac02d576
Calin Juravle [Mon, 22 Jan 2018 20:50:01 +0000 (12:50 -0800)]
Perform a non strict matching of .dm files when computing the size
'adb shell pm install' creates the PackageLite structure without
validating or renaming the input files to '.apk'.
Be more permissive in DexMetadataHeler when computing the size of the
package to allow for this scenario.
(cherry picked from commit
10b27eb2ccbb8992895827c0fb21e2d3f9c727db)
Test: atest
core/tests/coretests/src/android/content/pm/dex/DexMetadataHelperTest.java
Bug:
72267410
Merged-In: Ica446b0822be71826d02d01ada015a43d8133c68
Change-Id: Ica446b0822be71826d02d01ada015a43d8133c68
Jiyong Park [Wed, 14 Feb 2018 16:17:16 +0000 (16:17 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps" am:
779f561650
am:
78c71ca44b
Change-Id: I4e97594663b711f18a3940e002fceac215575d1c
Jiyong Park [Wed, 14 Feb 2018 16:08:59 +0000 (16:08 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps"
am:
779f561650
Change-Id: Iccbb6f4f98aece6ee8d5f41c95e5f0eb56bff94e
Calin Juravle [Tue, 12 Dec 2017 02:26:13 +0000 (18:26 -0800)]
Support installation of DexMetadata files (.dm)
Add support in the package installer to install dex metadata files
alongside the application apks (base or splits).
During installation or update the dex metadata files will need to have a
matching apk file. The matching is done by checking the file extension
(e.g. base.apk -> base.dm, split_a.apk -> split.dm).
On disk, the metadata files are placed next to the apks.
The .dm files will be used during install-time optimizations and passed
verbatim to dex2oat.
Test: adb shell am instrument -w \
1) adb shell am instrument -w \
-e class android.content.pm.DexMetadataHelperTest
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
2) adb install-multiple CtsClassloaderSplitApp.apk
CtsClassloaderSplitApp.dm CtsClassloaderSplitAppFeatureA.apk
CtsClassloaderSplitAppFeatureA.dm CtsClassloaderSplitAppFeatureB.apk
3) gts-tradefed -m GtsAndroidRuntimeManagerHostTestCases
(cherry picked from commit
3fc56c30000d9b88c2145d4297a97ec5061d60d1)
Bug:
30934496
Merged-In: I86f0a8307705ff3d6a5a85c2fcaae085dd62d4af
Change-Id: I86f0a8307705ff3d6a5a85c2fcaae085dd62d4af
Calin Juravle [Tue, 5 Dec 2017 20:33:32 +0000 (12:33 -0800)]
Rename snapshotProfile to createProfileSnapshot for consistency
(cherry picked from commit
388cd5fffe7564ae364776d7f557e3a301387840)
Test: build
Bug:
30934496
Merged-In: I602262d22509b279383ff2a71e38c8bae059498a
Change-Id: I602262d22509b279383ff2a71e38c8bae059498a
Calin Juravle [Thu, 30 Nov 2017 02:26:55 +0000 (18:26 -0800)]
Implement ArtManager#snapshotProfile API
Complete the implementation of ArtManager#snapshotProfile. The snapshot is
performed by calling the installer and then return to the caller via the
specified callback.
(cherry picked from commit
fd9f8ae973122a50f336e38c386ecbc0095d8adc)
Bug:
30934496
Test: gts-tradefed -m GtsAndroidRuntimeManagerHostTestCases
Merged-In: I87131487846d91d79a56041445420376b61ca8e7
Change-Id: I87131487846d91d79a56041445420376b61ca8e7
Calin Juravle [Wed, 8 Nov 2017 02:49:43 +0000 (18:49 -0800)]
Add SystemApis to expose runtime profile information
The API allows a system apps which acquired
{@code android.permission.READ_RUNTIME_PROFILE} to snapshot the runtime
profiles of installed packages.
The API is implemented in a new service class (AndroidRuntimeManager)
accessible from the context using
context().getPackageManager().getAndroidRuntimeManager().
The main functionality is exposed as a one way call into the
AndroidRuntimeManager with the result being posted on a callback. The
profile is available to the caller as a read-only ParcelFileDescriptor.
This CL only adds the API interfaces and validation. It does not fully
implement the functionality.
oneway void snapshotRuntimeProfile(in String packageName,
in String codePath, in ISnapshotRuntimeProfileCallback callback)
(cherry picked from commit
45f8b29ce0ca9f80c586850c4be3a1e552bc6c2f)
Bug:
30934496
Test: gts-tradefed -m GtsAndroidRuntimeManagerHostTestCases
Merged-In: Iaa6be4715840f24508acba3162ea9c1ab725bd38
Change-Id: Iaa6be4715840f24508acba3162ea9c1ab725bd38
Alan Stokes [Mon, 16 Oct 2017 11:31:44 +0000 (12:31 +0100)]
Log SHA256 of secondary dex files during reconcile.
(cherry picked from commit
a0023604ddaeef34049f1a245be7c42a66a7d0e8)
Bug:
63927552
Test: Exercised manually. Added unit test for DexManager.
Merged-In: Ic8e9ea4da8eb5c22fbe088a59a406e36bc2eb6fa
Change-Id: Ic8e9ea4da8eb5c22fbe088a59a406e36bc2eb6fa
Treehugger Robot [Wed, 14 Feb 2018 15:02:22 +0000 (15:02 +0000)]
Merge "Fix link-type check warning on PMTest_Java* test apps"
Nicolas Geoffray [Wed, 14 Feb 2018 14:07:55 +0000 (14:07 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive" am:
46b4862d20
am:
d0f327cc60
Change-Id: Iaa313ddff5b22ed22baa916d931befc7a59090ba
Nicolas Geoffray [Wed, 14 Feb 2018 13:57:37 +0000 (13:57 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive"
am:
46b4862d20
Change-Id: Ib750c357265a13f60032104371d84974df17776e
Nicolas Geoffray [Wed, 14 Feb 2018 11:41:02 +0000 (11:41 +0000)]
Merge "Refactor runtime hidden API flag from negative to positive"
Martijn Coenen [Wed, 14 Feb 2018 11:15:37 +0000 (11:15 +0000)]
Merge "add swapPss of native process to totalSwapPss" am:
0db84fcc8f
am:
c3af6331e5
Change-Id: I4e8dbdd04ae92d1b6882ac476e8b4990a34bbb27
Martijn Coenen [Wed, 14 Feb 2018 11:08:54 +0000 (11:08 +0000)]
Merge "add swapPss of native process to totalSwapPss"
am:
0db84fcc8f
Change-Id: I615e245f2f0f50f2afe8726ada55a81101fce6bb
David Brazdil [Tue, 13 Feb 2018 17:04:26 +0000 (17:04 +0000)]
Refactor runtime hidden API flag from negative to positive
There are only two situations in which we want to enable hidden API
access flag checks. Turning the flag from DISABLE_ to ENABLE_
simplifies logic in ART and reduces the number places where the flag
had to be passed down to ART.
Bug:
64382372
Test: boot device, install and run apps, check log messages
(cherry picked from commit
f7e31c0a2b69e97662e2bdeb7e5b5c6d0a7f995c)
Change-Id: Ib2f70696d98c6e1500d1d419d6acf0a8d0487213
Martijn Coenen [Wed, 14 Feb 2018 09:17:32 +0000 (09:17 +0000)]
Merge "add swapPss of native process to totalSwapPss"
fionaxu [Mon, 29 Jan 2018 22:08:12 +0000 (14:08 -0800)]
add a current table in CarrierIdProvider
restructure CarrierIdProvider into two tables
1. All - a private table which stores a complete mapping of all carriers
2. Current - a public table only stores the carrier identification of the
current active subs. require no permission to query.
expose the content url to public so that apps could be
notified on carrier identity change either on background or foreground.
Bug:
72571475
Test: runtest --path CarrierIdProviderTest.java
Test: Manual
Change-Id: If2a20288e63d25343f5bb582b35564d769a4e13b
(cherry picked from commit
3d00d698d7d6c10628076cca8df30adb50c52563)
Merged-in: If2a20288e63d25343f5bb582b35564d769a4e13b
Jiyong Park [Wed, 14 Feb 2018 07:26:04 +0000 (16:26 +0900)]
Fix link-type check warning on PMTest_Java* test apps
The test apps are built with SDK, but are using native libraries built
without SDK (libpmtest(32|64|dual)). This has been causing link-type check
warning, which will be errors soon.
Fixing the warning by building the native libraries with SDK.
Bug:
69899800
Test: mma -j under
frameworks/base/core/tests/hosttests/test-apps/SharedUid is successful
and does not show any link-type check warning
Change-Id: I660edb9accd8965ddd471f88f2b47f6b7285b83f
Chalard Jean [Fri, 9 Feb 2018 20:33:50 +0000 (05:33 +0900)]
Deprecate CONNECTIVITY_ACTION.
That was its destiny.
Use NetworkCallbacks instead.
Test: runtest frameworks-net, but this is only doc changes
Change-Id: I3d68dbf817de92c66d899a7cc4519c5639e4c049
Chalard Jean [Tue, 30 Jan 2018 13:41:41 +0000 (22:41 +0900)]
Publish FOREGROUND and add NOT_SUSPENDED capabilities.
NOT_SUSPENDED and FOREGROUND are capabilities that need to
be public so as to reach feature parity with what information
can be gotten through the use of CONNECTIVITY_ACTION and
synchronous calls to ConnectivityManager. This change makes
them public, and wires up the NOT_SUSPENDED capability.
This deprecates in effect the old onSuspended and onResumed
callbacks, but these have never been public.
This also converts the onAvailable path from a multiple
binder call design to a simpler, single binder call. This
is only for internal convenience
Test: runtest frameworks-net
Test: cts
Test: also manual testing
Change-Id: I6ea524bb361ecef0569ea2f9006c1e516378bc25
Robert Sesek [Wed, 14 Feb 2018 05:43:52 +0000 (05:43 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress." am:
9fda81e274
am:
9b13db0938
Change-Id: Ic977e64157b6c140f4ac6c22643ca1b9375f855c
Robert Sesek [Wed, 14 Feb 2018 05:36:58 +0000 (05:36 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress."
am:
9fda81e274
Change-Id: If044eb9eb5b27e7fa21d750dd09a8e56c07b8e50
Chalard Jean [Fri, 26 Jan 2018 10:24:40 +0000 (19:24 +0900)]
Send null UIDs to apps instead of single-uid lists.
Prior to this change ConnectivityManager used to patch in the UID
of the requesting app inside the NetworkCapabilities sent to it.
The rationale was that the app may not know what other apps may
use the network, so the view it should have of the network should
always say the network only applies to that app.
But this has an unfortunate side effect : apps can't match the
received network against a default NetworkCapabilities. Ostensibly
this only applies to the system because all involved calls are
@hide, but still : system code would get some NetworkCapabilities,
for example using networkCapabilitiesForType, and then try to
match the capabilities of an available network using
satisfiedByNetworkCapabilities. Because the passed network is
declared to only apply to one's own UID and the UIDs of the
NetworkCapabilities are set to null meaning "I need this network
to apply to all UIDs", the answer will be "false".
While this is WAI in a sense, it is very counter-intuitive that
code trying to match a network would be required to patch in its
own UIDs.
There are three ways of fixing this :
1. Require all apps to do the above. It's correct, but it's
cumbersome and counterintuitive. Multiple places in existing
code needs to be fixed, Tethering is an example.
2. Write the UIDs of the caller in any NetworkCapabilities object
that is created. This is not very practical, because it imposes
the converse requirement on all NetworkAgents, which would then
have to clear the UIDs before they send the capabilities to
ConnectivityService. All NetworkAgents need to be fixed.
3. Instead of sending an object with a list of one UID to apps,
send a null list. The drawback is that the networks nominally
look to apps like they apply to all apps. I argue this does
not matter ; what matters is that the UID lists do not leak.
Clients just see a null list of UIDs (and third party can't
even access them without using reflection). No other changes
are required besides this two-line patch.
This patch implements 3. I believe it is the saner approach, with
both the most intuitive behavior and the best backward compatibility
characteristics, as well as the easiest change.
This does not encroach on the future plans to make the actual
UID list available to apps with NETWORK_SETTINGS.
Test: runtest frameworks-net
Change-Id: I978d91197668119e051c24e1d04aafe1644a41cf
Treehugger Robot [Wed, 14 Feb 2018 03:35:37 +0000 (03:35 +0000)]
Merge "Refactor ZygoteProcess to deal in LocalSocketAddress."
Tyler Gunn [Wed, 14 Feb 2018 01:09:08 +0000 (01:09 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity." am:
d1134525fc
am:
a0b41a82ce
Change-Id: I6b5e25889bf0b5ceab71fe21d1856214d12a593d
Tyler Gunn [Wed, 14 Feb 2018 00:59:16 +0000 (00:59 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity."
am:
d1134525fc
Change-Id: Ic2a84646352e79961d2e5d842b307a0d647350bb
Holly Jiuyu Sun [Wed, 14 Feb 2018 00:24:46 +0000 (00:24 +0000)]
Merge "Public EuiccManager APIs." am:
42339c464f
am:
cddc0c12cc
Change-Id: I01d436c16df678292c8aec1f3ea2d7a65f3e10dd
Malcolm Chen [Wed, 14 Feb 2018 00:12:29 +0000 (00:12 +0000)]
Merge "Add death recipient to TelephonyRegistry." am:
e42d29f31b
am:
244804f1b2
Change-Id: I2494c9affb98b646c74bf4983eebaa1becc62ff7
Holly Jiuyu Sun [Wed, 14 Feb 2018 00:08:35 +0000 (00:08 +0000)]
Merge "Public EuiccManager APIs."
am:
42339c464f
Change-Id: I95f1713b1a1be188e7eae62adbfc975bfca982c3
Malcolm Chen [Wed, 14 Feb 2018 00:04:57 +0000 (00:04 +0000)]
Merge "Add death recipient to TelephonyRegistry."
am:
e42d29f31b
Change-Id: I20eb0b07a89b6dde2187339e28c0c3b50323370d
Treehugger Robot [Tue, 13 Feb 2018 23:27:33 +0000 (23:27 +0000)]
Merge "Rename Conference#setConnectionElapsedTime to clarity."
Benedict Wong [Wed, 7 Feb 2018 04:43:21 +0000 (20:43 -0800)]
Copy IpSecConfig when IpSecTransforms are created
This change prevents IpSecTransforms from being inadvertently modified
by changes to the IpSecConfig. Specifically, once the transform is
created, it takes a copy of the config, rather than a reference.
Bug:
69385347
Test: New tests added, and all test passing
Change-Id: I89b8660c175ca20aa70352dcda893434ff7fd42b
Holly Jiuyu Sun [Tue, 13 Feb 2018 22:56:08 +0000 (22:56 +0000)]
Merge "Public EuiccManager APIs."
Qingxi Li [Tue, 13 Feb 2018 22:19:02 +0000 (22:19 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo" am:
909e9d3e49
am:
feba71b4ef
Change-Id: I4c65138fd4283c2023737c294f92d82346943157
Qingxi Li [Tue, 13 Feb 2018 22:06:45 +0000 (22:06 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo"
am:
909e9d3e49
Change-Id: I610ad9785c419c864a604c2a330e07e56b6a19f2
Treehugger Robot [Tue, 13 Feb 2018 21:27:39 +0000 (21:27 +0000)]
Merge "Add death recipient to TelephonyRegistry."
Holly Jiuyu Sun [Wed, 13 Dec 2017 04:17:09 +0000 (20:17 -0800)]
Public EuiccManager APIs.
Public EuiccManager and other related necessary files.
Mark EuiccCardManager and other related necessary files as @SystemApi.
Solve lint errors and warnings.
Bug:
35851809
Test: test on phone
Change-Id: I8a2c78804cae56b679d311d613edca5be4bc2522
Merged-In: I68853e134e1e31fa9b91a83af6c491a2a8cca971
Treehugger Robot [Tue, 13 Feb 2018 19:32:01 +0000 (19:32 +0000)]
Merge "Add interfact to get phone ID from UiccSlotInfo"
Qingxi Li [Wed, 31 Jan 2018 21:54:34 +0000 (13:54 -0800)]
Add interfact to get phone ID from UiccSlotInfo
Bug:
72753162
Test: TreeHugger
Merged-In: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Change-Id: I7733a5f60cf4535339fe9b44e99178304ccbb2c0
Robert Sesek [Fri, 26 Jan 2018 19:26:53 +0000 (14:26 -0500)]
Refactor ZygoteProcess to deal in LocalSocketAddress.
Currently ZygoteProcess only uses String names in the RESERVED socket
namespace. This CL reworks the class to use LocalSocketAddress, so that
other socket namespaces can be used to communicate with zygotes.
Bug:
63749735
Test: m (no functional change)
Merged-In: I4146f684bfcd78b16500829d02ff54590a8b48f5
Change-Id: I0113a7189530c2e57c48058df542057e855bae42
Malcolm Chen [Tue, 13 Feb 2018 03:15:59 +0000 (19:15 -0800)]
Add death recipient to TelephonyRegistry.
Add death recipient to TelephonyRegistry so that all binders that
connect to TelephonyRegistry will be cleaned when they are died.
Test: manual
Bug:
73107019
Change-Id: Ib44f72b769272cef9f36f7b49097091a93bcc70e
hansson [Tue, 13 Feb 2018 16:39:33 +0000 (16:39 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log" am:
c0c9f53175
am:
78d15fd15a
Change-Id: Ie90bccf5aa5fb67e1b4769fcbb1013b1fae71063
hansson [Tue, 13 Feb 2018 16:31:53 +0000 (16:31 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"
am:
c0c9f53175
Change-Id: I25f1aad9e04c22e0cd4ffc848a53c30dd740bdac
hansson [Tue, 13 Feb 2018 14:42:03 +0000 (14:42 +0000)]
Merge "fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log"
yuanhuihui [Sat, 18 Mar 2017 11:34:31 +0000 (19:34 +0800)]
fix misleading FATAL EXCEPTION IN SYSTEM PROCESS log
There will be the following situations about mApplicationObject:
1) fork app process will invoke ActivityThread.main(),
then set mApplicationObject.
2) fork system_server, don't set mApplicationObject value.
3) using app_process fork process except zygote, will inovke RuntimeInit,
don't set mApplicationObject value。
For example using command as below:
app_process /system/bin com.android.commands.am.Am "$@",
if this process throw uncaught exception,will output FATAL EXCEPTION IN SYSTEM PROCESS log,
it's not in system process but in normal process。
so should add condition: Process.SYSTEM_UID == Process.myUid()
BUG:
72759350
Test: manual
Change-Id: Ie8d769e4149cd9b938577058de871c4f8db9efe5
Signed-off-by: yuanhuihui <yuanhuihui@xiaomi.com>
Tyler Gunn [Tue, 13 Feb 2018 10:01:58 +0000 (10:01 +0000)]
Merge "Updates to Telecom API docs for clarity." am:
e845bddb40
am:
8fe8f5fa9b
Change-Id: I0a18edd6dc7347b7b08d59ab89f767b98fde1372
Tyler Gunn [Tue, 13 Feb 2018 09:46:21 +0000 (09:46 +0000)]
Merge "Updates to Telecom API docs for clarity."
am:
e845bddb40
Change-Id: I9b988dc7e70b9b9f1c30fa6991d841183850a49a