379583 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
dacee147b4 Remove deps from framework on netd interfaces
If included in framework.jar, the interfaces conflict with any app that
needs to depend on them, including the NetworkStack.

Bug: 124033493
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I2db9f87b7154130726d4700b241d55b041635d98
Merged-In: I0ecae20d514bf888f3a80331f19369ceb1c52aa3
2019-02-14 17:26:59 +09:00
Jordan Liu
b8493ac5eb Merge "Add UNINITIALIZED and rename INVALID" 2019-02-14 00:14:11 +00:00
Hall Liu
a3aae9fe4b Merge "Implement more location checks" 2019-02-13 23:21:43 +00:00
Treehugger Robot
2f199d6b35 Merge "Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master" 2019-02-13 22:26:10 +00:00
Pengquan Meng
600827273c Merge "Add getSlotsMapping to TelephonyManager" 2019-02-13 22:23:16 +00:00
Hui Yu
f57e401241 Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master
Bug: None.
Test: NA.
Change-Id: I04ebbaa3c2f939b139f0b8b6f25777383fd42375
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
2019-02-13 20:32:27 +00:00
Hui Yu
539c545dc7 Merge "Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"" 2019-02-13 20:23:03 +00:00
Hui Yu
a558b05d53 Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"
This reverts commit a738111eeea622a25cb50ed7bcae5cbf0218b137.

Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title.

Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97
2019-02-13 20:10:27 +00:00
Jordan Liu
75a0066880 Merge "Update documentation for SubscriptionManager listener" 2019-02-13 19:26:58 +00:00
Tianjie Xu
c8f5981028 Merge "Improved wipe reason information for RecoverySystem" 2019-02-13 19:18:01 +00:00
Hall Liu
ee313737e9 Implement more location checks
Make the following modifications to APIs and required permissions.
Move the following APIs from checking coarse permission to fine
permission (except for apps targeting pre-Q):
TelephonyManager.getCellLocation()
(deprecated) TelephonyManager.getNeighboringCellInfo()
TelephonyManager.getAllCellInfo()
TelephonyManager.requestCellInfoUpdate()
PhoneStateListener#onCellLocationChanged
PhoneStateListener#onCellInfoChanged

Start checking for fine permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager.requestNetworkScan()
TelephonyScanManager.requestNetworkScan()
NetworkScanCallback#onResults

Start checking for coarse permission on the following APIs:
(Note -- these will only be logged, not denied until a future CL)
TelephonyManager#getAvailableNetworks
TelephonyManager#getServiceStateForSubscriber and #getServiceState
PhoneStateListener#onServiceStateChanged

Bug: 116258458
Test: manual via testapps
Change-Id: I45326ddacbcf538da50ca544d67eed12cf0c0861
2019-02-13 11:07:37 -08:00
Nathan Harold
627900696f Merge "Add missing UARFCN Getter to CellIdentityTdscdma" 2019-02-13 18:17:36 +00:00
Fan Zhang
accbb6b3c6 Merge "Revert "Enable static overlay for SettingsLib resources"" 2019-02-13 18:04:09 +00:00
Fan Zhang
086c189e20 Revert "Enable static overlay for SettingsLib resources"
This reverts commit 6828b0f191e49859345d81694282e1dcda599462.

Fixes: 124370422


Reason for revert: b/124370422


Error: 

The following topic from AOSP:

https://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)

Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:

FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2

Change-Id: I9b980c512eb354f87470bcefe1df095fc5c9a807
2019-02-13 18:00:16 +00:00
Jordan Liu
1f85a3ddf3 Add UNINITIALIZED and rename INVALID
UNINITIALIZED_CARD_ID is for before the card ID is ready.
INVALID_CARD_ID is renamed to UNSUPPORTED_CARD_ID and it is used if the
card ID is known to be unsupported.

Bug: 122978614
Test: atest UiccControllerTest
Change-Id: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
Merged-In: Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df
2019-02-13 09:54:30 -08:00
Blake Kragten
366318b9c3 Merge "Modem power monitor" 2019-02-13 17:21:30 +00:00
Blake Kragten
4d3a9f2b3c Modem power monitor
This is an AOSP carry over for the frameworks base CL. This change is needed here to allow telephony changes to be added to AOSP with no issues.

Adding monitored power rail as a new cellular battery stats component. This will be used to better determine actual power usage of the modem rather than relying on battery reduction rates.

If the device does not support rail power monitoring then this value
will always remain at 0.

Test: adb shell dumpsys activity service TelephonyDebugService --metrics
Results Examples:
	Energy consumed by modem (mAh): 2.41

Change-Id: If85af2f2e1b255661e189c5375ecc5825be84c58
2019-02-13 16:02:03 +00:00
Paul Duffin
32bfd77b79 Merge "Use filegroup name not contents in $(location ...)" 2019-02-13 10:12:46 +00:00
Hans Boehm
2b56c4cf48 Merge "Adjust AsyncTask.THREAD_POOL_EXECUTOR config" 2019-02-13 05:14:43 +00:00
Treehugger Robot
60bcd226d5 Merge "Added backwards compatibility support for data reg" 2019-02-13 03:55:47 +00:00
Mark Chien
8fee3dee71 Merge "Support multi-SIM entitlement check" 2019-02-13 02:29:01 +00:00
Treehugger Robot
661bb0414e Merge changes from topic "cut_dependency"
* changes:
  Revert "Delay start of bootanimation until after the Runtime APEX is mounted."
  Cut the static deps from libandroid_runtime to libnativeloader and libnativebridge
2019-02-13 02:17:35 +00:00
Yutaro Maruyama
3835f6a4f9 Improved wipe reason information for RecoverySystem
More information will be useful to investigate unintentional wipe
for users. Added timestamp information into reason text.

Bug: 120586954
Change-Id: I26dd4eff815d736bf34e944be6843cbb80515ca9
2019-02-13 10:53:16 +09:00
Po-Chien Hsueh
fa240e8054 Merge "Add DynamicAndroidClient" 2019-02-13 01:20:26 +00:00
vichang
9de24de618 Merge "Include /apex/com.android.runtime for native library in app classloader" 2019-02-13 00:58:37 +00:00
Pengquan Meng
0c44939a95 Add getSlotsMapping to TelephonyManager
Bug: 123101769
Test: build
Merged-In: I416d741947b1a15e66ebf71b8104c4b2ec95e310
Change-Id: I416d741947b1a15e66ebf71b8104c4b2ec95e310
(cherry picked from commit 83e7b920deec8d163c3ddd9c56343ce8bcea0a9e)
2019-02-12 16:24:22 -08:00
Fan Zhang
e3483a5814 Merge "Enable static overlay for SettingsLib resources" 2019-02-13 00:12:08 +00:00
Remi NGUYEN VAN
c96b852f46 Merge "Check NetworkStack UID and perms before binding" 2019-02-13 00:10:18 +00:00
Brad Ebinger
76bc8cf927 Merge "Telephony: Add 7bit Ascii support for long message" 2019-02-12 23:55:32 +00:00
Hans Boehm
573bb79cfb Adjust AsyncTask.THREAD_POOL_EXECUTOR config
Remove the queue, reduce core pool size but no longer let it time out.

Reduce the timeout for additional threads.

If necessary, use a special executor, with an unbounded queue, to run
overflow tasks.

Bug: 123762797
Test: AOSP boots, also with MAXIMUM_POOL_SIZE = 1.
Change-Id: I4bc9593a044d1773ff1878684e2397a7c2a9a87a
2019-02-12 15:43:26 -08:00
Chen Xu
307f4cfeb1 Merge "Address API feedbacks for networktypebitmask" 2019-02-12 23:27:36 +00:00
Nathan Harold
be5b40b90f Merge "Add NR Cell Identity to CellIdentityNr" 2019-02-12 23:18:15 +00:00
Treehugger Robot
c3382935d9 Merge "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master" 2019-02-12 22:48:41 +00:00
Jack Yu
8fdb750e5f Added backwards compatibility support for data reg
Test: Manual
Bug: Bug: 73659459
Change-Id: Ib254f5bf77cbc429826a58f55babbb971db61175
2019-02-12 13:54:11 -08:00
Nathan Harold
da59b53907 Add missing UARFCN Getter to CellIdentityTdscdma
Add a method to get the UARFCN for CellIdentityTdscdma.
There is an equivalent method in all the other classes,
so this is simply correcting an oversight.

Bug: 123957505
Test: atest CellIdentityTdscdmaTest
Change-Id: I743d90b4532b86edb34d267ae55eca73de2a0086
2019-02-12 13:26:46 -08:00
Nathan Harold
e13c593c9f Add NR Cell Identity to CellIdentityNr
Add the NCI to CellIdentityNr.

Bug: 124126359
Test: atest CellIdentityNrTest
Change-Id: I628048c61d3d6b6e2439357e8233c483a3c0d1d4
2019-02-12 13:26:46 -08:00
Treehugger Robot
0b3cef8697 Merge "Mark FrameMetricsObserver::notify() as pure virtual" 2019-02-12 19:31:18 +00:00
Hui Yu
a738111eee RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master
To pick up statsd atom ProcessStartTime.

Bug: None.
Test: NA.
Change-Id: If6b99c0b6b501036ffde1e9a45194a039a8d7c73
Merged-In: Ifcc0c80f1da45c2ff89f7c88da6407ba777473e2
2019-02-12 19:17:44 +00:00
chen xu
fdeb60bd74 Address API feedbacks for networktypebitmask
1. change networktypebitmask from int to long
2. right shift definition by 1 for each bitmask, in consistent with
NW bitmask used in APN settings
3. add missing definition for IWLAN

Bug: 119118373
Test: atest CtsTelephonyTestCases:TelephonyManagerTest#testGetRadioAccessFamily
Change-Id: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
(cherry picked from commit 75b486e4c820e4d51c258fea43f959c92d797725)
Merged-in: Idf0f88225c20fc0ed10ae4fccb705f988a3bec60
2019-02-12 19:13:09 +00:00
Treehugger Robot
9e74581c7c Merge "Schematize ADB system properties" 2019-02-12 18:35:23 +00:00
Jordan Liu
45da505ecd Update documentation for SubscriptionManager listener
This will match the documentation in TM.listen() and PhoneStateListener.

Bug: 124204168
Test: no behavior change
Change-Id: Ifde6382e4b6947417a89032805499c48288f8438
2019-02-12 10:31:35 -08:00
Steven Moreland
3e141a27c9 Merge "Remove duplicate networkstack-aidl-interfaces-java" 2019-02-12 18:29:24 +00:00
Steven Moreland
c7c7fe6325 Merge "Remove ParcelFileDescriptor.aidl" 2019-02-12 17:51:35 +00:00
Treehugger Robot
bbd757d791 Merge "Remove unused build variable framework_docs_args" 2019-02-12 17:32:40 +00:00
Jack Yu
9718148ef7 Merge "Removed unused variables in cat service" 2019-02-12 16:52:48 +00:00
Victor Chang
a366cc8c52 Include /apex/com.android.runtime for native library in app classloader
Bug: 123702996
Test: Manual test. After moving libicuuc.so into the apex path,
  call System.loadLibrary("icuuc") in test app
Test: CtsJniTestCases pass after moving libicuuc into apex and applied
CTS patch here. http://r.android.com/898053

Change-Id: Ic9049c1595b4ea029ec65649c3f3283672744569
2019-02-12 14:53:01 +00:00
Paul Duffin
cf2e989220 Use filegroup name not contents in $(location ...)
Bug: 124218911
Test: make checkbuild
Change-Id: I0427ed4c73e4cf06f09b520a886ccf6ed0d150b2
2019-02-12 12:39:42 +00:00
Paul Duffin
e1a3fa5ef8 Remove unused build variable framework_docs_args
Bug: 124218911
Test: make checkbuild
Change-Id: I39c73bc8bee3824161e91967ec187ce60e838b48
2019-02-12 12:39:42 +00:00
Jiyong Park
706bf3f628 Revert "Delay start of bootanimation until after the Runtime APEX is mounted."
This reverts commit d848183572d7c347937b871e9d341e0938d8764b.

Reason: the static deps to libnativeloader and libnativebridge no longer
exist

Bug: 123403798
Test: Device boots to the UI
Test: bootanimation is shown from the very beginning

Change-Id: I1a3f214b1d9a19520998c7d1f2d288465a831892
2019-02-12 19:35:45 +09:00
Jiyong Park
83207a29e1 Cut the static deps from libandroid_runtime to libnativeloader and libnativebridge
The dependencies are replaced with *_lazy libraries which dynamically
load and links to the real libraries at runtime using dlopen and dlsym.

This allows libandroid_runtime to be used by early processes that are executed
before the activation of the runtime APEX where libnativeloader and
libnativebridge are provided.

Bug: 123403798
Test: m
Test: device boots to the UI
Change-Id: I89a11bd0e9bef77db5da6d80840728b9a6f2a528
2019-02-12 19:35:45 +09:00