OSDN Git Service

android-x86/frameworks-base.git
5 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 25 Oct 2018 06:18:42 +0000 (23:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie2e07cbd6d038a83b2f05b315b647a35872f6daf
Auto-generated-cl: translation import

5 years agoMerge pie-platform-release to aosp-master - DO NOT MERGE
Bill Yi [Wed, 24 Oct 2018 21:48:44 +0000 (14:48 -0700)]
Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I695db52f5e22509401258e8b083e7650d401d993

5 years agoMerge "Remove obsolete @VisibleForTesting Annotation"
Brad Ebinger [Wed, 24 Oct 2018 20:15:35 +0000 (20:15 +0000)]
Merge "Remove obsolete @VisibleForTesting Annotation"

5 years agoMerge "ImsSsData needs a public constructor for vendors to use"
Brad Ebinger [Wed, 24 Oct 2018 17:08:39 +0000 (17:08 +0000)]
Merge "ImsSsData needs a public constructor for vendors to use"

5 years agoMerge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""
Youming Ye [Wed, 24 Oct 2018 16:26:21 +0000 (16:26 +0000)]
Merge "Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting""

5 years agoMerge "[Call Screening]Support for carrier call screening app"
Tony Zhu [Wed, 24 Oct 2018 15:51:48 +0000 (15:51 +0000)]
Merge "[Call Screening]Support for carrier call screening app"

5 years agoMerge "To support skip464xlat per Network"
Chalard Jean [Wed, 24 Oct 2018 07:15:20 +0000 (07:15 +0000)]
Merge "To support skip464xlat per Network"

5 years agoMerge "Refine network-related commands porting"
Treehugger Robot [Wed, 24 Oct 2018 03:15:41 +0000 (03:15 +0000)]
Merge "Refine network-related commands porting"

5 years agoMerge "Move captive portal detection to another thread"
Chiachang Wang [Wed, 24 Oct 2018 03:02:58 +0000 (03:02 +0000)]
Merge "Move captive portal detection to another thread"

5 years agoMerge "Add test API to override carrier config"
Hall Liu [Wed, 24 Oct 2018 00:00:22 +0000 (00:00 +0000)]
Merge "Add test API to override carrier config"

5 years agoMerge "Add getMobileNetworkOperator to CellIdentityTdscdma"
Nathan Harold [Tue, 23 Oct 2018 23:34:26 +0000 (23:34 +0000)]
Merge "Add getMobileNetworkOperator to CellIdentityTdscdma"

5 years agoRemove obsolete @VisibleForTesting Annotation
Brad Ebinger [Tue, 23 Oct 2018 22:46:59 +0000 (15:46 -0700)]
Remove obsolete @VisibleForTesting Annotation

Bug: 118296374
Test: atest FrameworksTelephonyTests
Change-Id: I5156db7d199f89307ca7c602bfc855dbc6ae236e

5 years agoMerge "Fix for android.hardware.radio.Utils.createIntSet"
Treehugger Robot [Tue, 23 Oct 2018 22:18:55 +0000 (22:18 +0000)]
Merge "Fix for android.hardware.radio.Utils.createIntSet"

5 years agoMerge "Remove Hidden TimestampType From CellInfo"
Nathan Harold [Tue, 23 Oct 2018 22:02:15 +0000 (22:02 +0000)]
Merge "Remove Hidden TimestampType From CellInfo"

5 years agoImsSsData needs a public constructor for vendors to use
Brad Ebinger [Thu, 11 Oct 2018 23:21:22 +0000 (16:21 -0700)]
ImsSsData needs a public constructor for vendors to use

Expose Builder for IMS Supp Service APIs as well as clean
up some of the ambiguous int[] usage.

Bug: 117555643
Test: Manual
Change-Id: I5cad08e0a032f4e38a62ac033c01111319cf9fd5

5 years agoMerge "Move some members to the "Q blacklist"."
Nathan Harold [Tue, 23 Oct 2018 21:53:51 +0000 (21:53 +0000)]
Merge "Move some members to the "Q blacklist"."

5 years agoMerge "Re-add removed APIs per API council feedback."
Tyler Gunn [Tue, 23 Oct 2018 20:49:43 +0000 (20:49 +0000)]
Merge "Re-add removed APIs per API council feedback."

5 years agoFix for android.hardware.radio.Utils.createIntSet
Jan Kowal [Thu, 27 Sep 2018 07:54:39 +0000 (09:54 +0200)]
Fix for android.hardware.radio.Utils.createIntSet

Previous solution was assymetric: writeInt vs readTypedObject.

Also, specify the initial capacity to avoid unnecessary reallocations.

Bug: 117113131
Test: atest BroadcastRadioTests
Change-Id: Ib33b97d482422b1acac8e9420a0c974bcd59355b

5 years agoAdd test API to override carrier config
Hall Liu [Tue, 23 Oct 2018 01:17:44 +0000 (18:17 -0700)]
Add test API to override carrier config

Add API surface and AIDL to enable override functionality for CTS

Change-Id: I55328a75f16fe91280530dd348d4a034694be6e9
Fixes: 118184943
Test: manually call api through shell cmd

5 years agoMerge "Fix data source for HEIF exif extractor"
Treehugger Robot [Tue, 23 Oct 2018 17:36:33 +0000 (17:36 +0000)]
Merge "Fix data source for HEIF exif extractor"

5 years agoMerge "Change caught exception in MediaScanner when ExifInterface is created"
Treehugger Robot [Tue, 23 Oct 2018 17:36:33 +0000 (17:36 +0000)]
Merge "Change caught exception in MediaScanner when ExifInterface is created"

5 years agoMerge "Add PhoneStateListener#onPreferredDataSubIdChanged"
Xiangyu/Malcolm Chen [Tue, 23 Oct 2018 17:03:22 +0000 (17:03 +0000)]
Merge "Add PhoneStateListener#onPreferredDataSubIdChanged"

5 years agoMerge "Adds new Public ImsManager API"
Brad Ebinger [Tue, 23 Oct 2018 16:50:04 +0000 (16:50 +0000)]
Merge "Adds new Public ImsManager API"

5 years agoMove captive portal detection to another thread
Chiachang Wang [Tue, 23 Oct 2018 13:10:57 +0000 (21:10 +0800)]
Move captive portal detection to another thread

isCaptivePortal() could take up to a minute. Resolving the
server's IP addresses could hit the DNS timeout, and attempting
connections to each of the server's several IP addresses
(currently one IPv4 and IPv6) could each take SOCKET_TIMEOUT_MS.
During this time this StateMachine will be unresponsive. Thus,
move detection to another thread.

Test: - runtest frameworks-net
      - run cts -m CtsNetTestCases
        -t android.net.cts.ConnectivityManagerTest
      - manual test(VALIDATION_SUCCESS, VALIDATION_FAILED,
        NETWORK_CAPTIVE_PORTAL_FOUND, bad network reported)
Bug: 113916551

Change-Id: I5ac39dc826acd26c64adaaa0b27a76cd7c7fd843

5 years agoRemove Hidden TimestampType From CellInfo
Nathan Harold [Sat, 6 Oct 2018 01:59:18 +0000 (18:59 -0700)]
Remove Hidden TimestampType From CellInfo

The timestamp type in CellInfo was added as an
experiment when CellInfo was first created. There
was optimism that highly precise timestamps would
be useful and available; however, in practice no
vendors are known to support precise timestamps
from the modem. Having a consistent timestap that
has a reference source available to apps is more
valuable than this flexibility. Thus, the reference
will always be nanotime since Android system boot,
and the timestamps will always be stamped by the
Android framework when the records are retrieved
from the modem.

Bug: 36971551
Test: atest FrameworksTelephonyTests

Change-Id: Ic5340b6c03ddc36aa00e7694c85b3af27128652e

5 years agoMove some members to the "Q blacklist".
Mathew Inwood [Fri, 14 Sep 2018 11:35:36 +0000 (12:35 +0100)]
Move some members to the "Q blacklist".

Based on some analysis, these fields/methods are likely false positives.
Set maxTargetSdk=P so that any apps using them are required to migrate off
them in future. See the bug for more details.

Exempted-From-Owner-Approval: Automatic changes to the codebase
affecting only @UnsupportedAppUsage annotations, themselves added
without requiring owners approval earlier.

Bug: 115609023
Test: m
Merged-In: I719b5c94e5b1f4fa562dd5d655953422958ad37e
Change-Id: I719b5c94e5b1f4fa562dd5d655953422958ad37e
(cherry picked from commit 8c854f86a477fbbee38092f449333e1425e5cd7e)

5 years agoMerge "Clarify createScaledBitmap's 'filter' docs"
Treehugger Robot [Mon, 22 Oct 2018 23:13:34 +0000 (23:13 +0000)]
Merge "Clarify createScaledBitmap's 'filter' docs"

5 years agoMerge "Move startop/tools/view_compiler to startop/view_compiler"
Treehugger Robot [Mon, 22 Oct 2018 22:38:20 +0000 (22:38 +0000)]
Merge "Move startop/tools/view_compiler to startop/view_compiler"

5 years agoAdd getMobileNetworkOperator to CellIdentityTdscdma
Nathan Harold [Mon, 22 Oct 2018 22:07:06 +0000 (15:07 -0700)]
Add getMobileNetworkOperator to CellIdentityTdscdma

For consistency with CellIdentityLte, Wcdma, and Gsm
adding this function. It will aid in future refactors
to possibly create a common interface for these classes.

Bug: 111808089
Test: compilation
Change-Id: Ia6b21bcc368089d8346951ae9476e7eb12a05130

5 years agoRe-add removed APIs per API council feedback.
Tyler Gunn [Mon, 22 Oct 2018 21:26:19 +0000 (14:26 -0700)]
Re-add removed APIs per API council feedback.

Some APIs were removed erroneously in the Q release; these methods were
just deprecated in Q,

Test: Make API, build
Bug: 116801893
Change-Id: I38ddf8bcd9fe39f4ba50bc892ac2f6d20209f7a9

5 years agoMerge "Add @Nullable for getSubscriptionIds"
Treehugger Robot [Mon, 22 Oct 2018 21:12:56 +0000 (21:12 +0000)]
Merge "Add @Nullable for getSubscriptionIds"

5 years agoAdd PhoneStateListener#onPreferredDataSubIdChanged
Malcolm Chen [Tue, 25 Sep 2018 03:01:32 +0000 (20:01 -0700)]
Add PhoneStateListener#onPreferredDataSubIdChanged

When SubscriptionManager#SetPreferredData changes preferredDataSub,
SubscriptionController notifies TelephonyRegistry and then notifies
all PhoneStateListeners that listen to the event.

Bug: 115550764
Test: unittest
Change-Id: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3
Merged-In: Icb0b349b9f07a52d7d9c5e8512f731986f1a1fa3

5 years agoMerge "Allow implicit-fallthrough warnings locally."
Chih-hung Hsieh [Mon, 22 Oct 2018 20:37:32 +0000 (20:37 +0000)]
Merge "Allow implicit-fallthrough warnings locally."

5 years agoClarify createScaledBitmap's 'filter' docs
John Reck [Mon, 22 Oct 2018 20:23:12 +0000 (13:23 -0700)]
Clarify createScaledBitmap's 'filter' docs

Reddit complained the docs were bad, so make the docs less bad.

Test: none
Change-Id: I61928ea859af4ce0a63a9b545ea1b6dd965cc3df

5 years agoMerge "Remove NotificationVisibility storage pool"
Hans Boehm [Mon, 22 Oct 2018 20:20:38 +0000 (20:20 +0000)]
Merge "Remove NotificationVisibility storage pool"

5 years agoAdds new Public ImsManager API
Brad Ebinger [Mon, 24 Sep 2018 20:13:55 +0000 (13:13 -0700)]
Adds new Public ImsManager API

Exposes IMS functionality using new ImsManager API.

Bug: 116493310
Bug: 112538960
Bug: 112866475
Test: Telephony Unit Tests
Merged-In: I856fd7edd7a8b6085567ae6de12340f9086a4903
Change-Id: I856fd7edd7a8b6085567ae6de12340f9086a4903

5 years agoMerge "Fixed unsafe lock upon safe media volume"
Eric Laurent [Mon, 22 Oct 2018 18:42:18 +0000 (18:42 +0000)]
Merge "Fixed unsafe lock upon safe media volume"

5 years agoMove startop/tools/view_compiler to startop/view_compiler
Eric Holk [Thu, 11 Oct 2018 21:20:39 +0000 (14:20 -0700)]
Move startop/tools/view_compiler to startop/view_compiler

This is planned to ship on device, so by convention the view_compiler should not
be in a tools directory.

Change-Id: I0eb03812d77ec38edc3908725acb40bacb345ecd

5 years agoMerge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType"
Chen Xu [Mon, 22 Oct 2018 17:30:16 +0000 (17:30 +0000)]
Merge "NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType"

5 years agoAllow implicit-fallthrough warnings locally.
Chih-Hung Hsieh [Mon, 22 Oct 2018 16:56:12 +0000 (09:56 -0700)]
Allow implicit-fallthrough warnings locally.

It will be a global error by default.

Test: make checkbuild
Bug: 112564944
Change-Id: I26616fd50ccf3639fa7c01d850a14d079273ede7
Exempt-From-Owner-Approval: do not block on new warnings

5 years agoMerge "Need to check empty not null for String"
Chen Xu [Mon, 22 Oct 2018 16:53:18 +0000 (16:53 +0000)]
Merge "Need to check empty not null for String"

5 years agoMerge changes from topic "carrier_id_aosp_cp"
Chen Xu [Mon, 22 Oct 2018 16:36:25 +0000 (16:36 +0000)]
Merge changes from topic "carrier_id_aosp_cp"

* changes:
  support mno carrier id
  support privilege access rule for carrier identification

5 years agoFix data source for HEIF exif extractor
Chong Zhang [Thu, 26 Jul 2018 22:54:18 +0000 (15:54 -0700)]
Fix data source for HEIF exif extractor

Do not allow the source to read past available bytes, since
the underlying input stream may not be able to seek after that.

For input streams from files, the available bytes is usually the
file size, and we usually don't have problem when the file is
of decent size. But when the file is very small, some of the
extractors (other than mp4) would request bytes past the end
of the file, which goes over the available range. Once that
condition is hit, we can't reset to the offet needed for
mp4 extractor and heif parsing would fail.

bug: 111897855
bug: 117625929
test: open heic files of various sizes in Files (Downloads) app,
check that ExifInterface shouldn't encounter any exceptions.

Change-Id: I668ff900f4155dc310cb7ea8977bbe091791c5d7

5 years agoMerge "Remove more libcore classes from light grey/vendor lists"
Paul Duffin [Mon, 22 Oct 2018 14:47:33 +0000 (14:47 +0000)]
Merge "Remove more libcore classes from light grey/vendor lists"

5 years agoRemove more libcore classes from light grey/vendor lists
Paul Duffin [Wed, 17 Oct 2018 10:37:57 +0000 (11:37 +0100)]
Remove more libcore classes from light grey/vendor lists

Removes more libcore classes from the light grey/vendor lists as they
are now using UnsupportedAppUsage annotation.

Test: ensured that generated light grey list did not change
Bug: 117818301
Merged-In: I2e12bad6dcf648ae9dfed2cd5a3d2c7f2a01a506
Change-Id: I1361408eacae9b7320babec8ddc2afb10d08feaf

5 years agoChange caught exception in MediaScanner when ExifInterface is created
Toshikazu Saito [Fri, 13 Jul 2018 01:37:59 +0000 (10:37 +0900)]
Change caught exception in MediaScanner when ExifInterface is created

Some HEIF content happens RuntimeException in ExifInterface because
sniff is failed and MediaExtractor is not found. If exception happens,
scanning is aborted. So all contents may not be registered to database
correctly. To avoid that, this fix changes caught exception from
IOException to Exception for creating ExifInterface.

Bug: 117625929
Test: put some HEIF contents and check on photos

Change-Id: I6d32dec27c3be13993ec08f92d567b772d03ace9

5 years agoMerge "Reduce excess local prefix computations"
Treehugger Robot [Mon, 22 Oct 2018 08:04:41 +0000 (08:04 +0000)]
Merge "Reduce excess local prefix computations"

5 years agoMerge "pm: Disallow HIDL libs from boot jars >= Q."
Treehugger Robot [Mon, 22 Oct 2018 07:08:10 +0000 (07:08 +0000)]
Merge "pm: Disallow HIDL libs from boot jars >= Q."

5 years agoReduce excess local prefix computations
markchien [Mon, 1 Oct 2018 13:18:15 +0000 (21:18 +0800)]
Reduce excess local prefix computations

only recomputing on the LISTEN_ALL callback

Test: - build, flash, booted
      - runtest frameworks-net

bug: 110335330

Change-Id: I606574f1a8a2899ed4688d7d5ec2cbe0f2638a94

5 years agoNWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType
chen xu [Thu, 18 Oct 2018 23:52:40 +0000 (16:52 -0700)]
NWRegState.getAccessNetworkTechnology in sync with SS.getNetworkType

Bug: 117954963
Test: telephony unit test
Change-Id: I3e31955992de63f7002cbfd7b91ec408b2ff7b75

5 years agoMerge "Remove explicit dependencies on core library"
Neil Fuller [Sun, 21 Oct 2018 18:10:48 +0000 (18:10 +0000)]
Merge "Remove explicit dependencies on core library"

5 years agosupport mno carrier id
chen xu [Tue, 16 Oct 2018 18:55:26 +0000 (11:55 -0700)]
support mno carrier id

Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a

5 years agosupport privilege access rule for carrier identification
fionaxu [Fri, 8 Jun 2018 23:55:25 +0000 (16:55 -0700)]
support privilege access rule for carrier identification

Bug: 69807697
Bug: 72665237
Test: Manual
Change-Id: I5e00302684b2be93ee956d43b04ca9a12d043158
Merged-in: I5e00302684b2be93ee956d43b04ca9a12d043158

5 years agoRemove explicit dependencies on core library
Neil Fuller [Thu, 18 Oct 2018 14:03:50 +0000 (15:03 +0100)]
Remove explicit dependencies on core library

These dependencies appear not to be necessary.

Test: make api-stubs-docs-update-current-api and inspect api/current.txt
Test: make docs and compare offline_sdk output
Bug: 113148576
Change-Id: If363aa99c8e230c0d63db6677241eb152a5b8fec

5 years agoMerge "Fix FD leak during ADB shell install."
Treehugger Robot [Sat, 20 Oct 2018 07:25:24 +0000 (07:25 +0000)]
Merge "Fix FD leak during ADB shell install."

5 years agoAdd @Nullable for getSubscriptionIds
sqian [Sat, 20 Oct 2018 02:01:42 +0000 (19:01 -0700)]
Add @Nullable for getSubscriptionIds

Bug: 117930253
Test: Treehugger
Change-Id: Ia24bd84bb93380473b9b5a2153b52538e86229db

5 years agoRemove NotificationVisibility storage pool
Hans Boehm [Sat, 13 Oct 2018 00:16:27 +0000 (17:16 -0700)]
Remove NotificationVisibility storage pool

Based on recent measurements, storage pools of small objects are
generally not useful.

We ran into this because growing ArrayDeques are potentially very
unfriendly towards a generational GC, and racing recycle calls
can cause it it grow beyond MAX_POOL_SIZE. This isn't a big deal,
but there's no reason we should even be thinking about it.

Test: Build and boot AOSP

Change-Id: Icbda95e472e206c54f141129cc36ddc6d163b095

5 years agoMerge "Fix implicit-fallthrough warnings. DO NOT MERGE."
Treehugger Robot [Sat, 20 Oct 2018 01:08:55 +0000 (01:08 +0000)]
Merge "Fix implicit-fallthrough warnings. DO NOT MERGE."

5 years agoMerge "Allow implicit-fallthrough warnings locally."
Chih-hung Hsieh [Sat, 20 Oct 2018 00:44:34 +0000 (00:44 +0000)]
Merge "Allow implicit-fallthrough warnings locally."

5 years agoMerge "Fix implicit-fallthrough warnings."
Treehugger Robot [Sat, 20 Oct 2018 00:15:20 +0000 (00:15 +0000)]
Merge "Fix implicit-fallthrough warnings."

5 years agoFix implicit-fallthrough warnings. DO NOT MERGE.
Chih-Hung Hsieh [Fri, 19 Oct 2018 22:32:26 +0000 (15:32 -0700)]
Fix implicit-fallthrough warnings. DO NOT MERGE.

These changes are not needed in goog/master.

Test: make checkbuild
Bug: 112564944
Change-Id: I75972e680c9502e1b83845f08e79b99a8084cc4c

5 years agoMerge "Mark 4 tests as FlakyTest"
Dan Shi [Fri, 19 Oct 2018 22:13:34 +0000 (22:13 +0000)]
Merge "Mark 4 tests as FlakyTest"

5 years agoRevert "Add CarrierConfig to hide "Network default" option in Caller ID setting"
Youming Ye [Fri, 19 Oct 2018 21:34:27 +0000 (21:34 +0000)]
Revert "Add CarrierConfig to hide "Network default" option in Caller ID setting"

This reverts commit 187c9943ff68dd30aac90ec322622eb67813d7ff.

Reason for revert: Slipped off master. Revert and try put it back.

Change-Id: I5823566523346c943c14e91848e7d5de9c14d68d

5 years agoMark 4 tests as FlakyTest
Dan Shi [Fri, 19 Oct 2018 21:25:36 +0000 (14:25 -0700)]
Mark 4 tests as FlakyTest

Until b/113616538 is fixed, a test class without FlakyTest, can be included in
a presubmit test mapping suite unexpectedly. Mark these 3 classes as FlakyTest
for now:
ActivityManagerServiceTest
AssistDataRequesterTest
AppErrorDialogTest

This test becomes unstable and still needs to be fixed before it can run in
presubmit:
TaskPositioningControllerTests

Bug: 117880789
Test: none
Change-Id: I3ed29bcbd30e34d6fd97169ac2913fbf312d4f70

5 years agoMerge "Merge pi-dr1-dev to aosp-master"
Bill Yi [Fri, 19 Oct 2018 21:19:30 +0000 (21:19 +0000)]
Merge "Merge pi-dr1-dev to aosp-master"

5 years agoFix implicit-fallthrough warnings.
Chih-Hung Hsieh [Fri, 19 Oct 2018 21:19:29 +0000 (14:19 -0700)]
Fix implicit-fallthrough warnings.

Test: make checkbuild
Bug: 112564944
Change-Id: Iaebada5e1a5d94ed06d9b584b888a4f78c0b8505

5 years agoMerge "Expose the empty MmTelCapabilities constructor"
Brad Ebinger [Fri, 19 Oct 2018 20:20:14 +0000 (20:20 +0000)]
Merge "Expose the empty MmTelCapabilities constructor"

5 years agoMerge "Remove resources for 4G/LTE/LTE+ icons"
Treehugger Robot [Fri, 19 Oct 2018 19:26:20 +0000 (19:26 +0000)]
Merge "Remove resources for 4G/LTE/LTE+ icons"

5 years agoMerge pi-dr1-dev to aosp-master
Bill Yi [Fri, 19 Oct 2018 19:20:31 +0000 (12:20 -0700)]
Merge pi-dr1-dev to aosp-master

Change-Id: I40fca8b785049f8563809a70f6671b8af89f3cfd

5 years agoMerge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"
Treehugger Robot [Fri, 19 Oct 2018 19:19:26 +0000 (19:19 +0000)]
Merge "correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED"

5 years agoAllow implicit-fallthrough warnings locally.
Chih-Hung Hsieh [Fri, 19 Oct 2018 19:13:48 +0000 (12:13 -0700)]
Allow implicit-fallthrough warnings locally.

It will be a global error by default.

Test: make checkbuild
Bug: 112564944
Change-Id: Ib23d0cc8b95a3734d5bd28f8c9d967df669cfdf8
Exempt-From-Owner-Approval: do not block on new warnings

5 years agoMerge "new SystemAPI for setCarrierDataEnabled"
Chen Xu [Fri, 19 Oct 2018 18:47:27 +0000 (18:47 +0000)]
Merge "new SystemAPI for setCarrierDataEnabled"

5 years agoMerge "Revert "Telephony light grey list clean up for Q""
Chen Xu [Fri, 19 Oct 2018 18:36:56 +0000 (18:36 +0000)]
Merge "Revert "Telephony light grey list clean up for Q""

5 years agoRemove resources for 4G/LTE/LTE+ icons
Niklas Lindgren [Mon, 24 Sep 2018 08:18:44 +0000 (10:18 +0200)]
Remove resources for 4G/LTE/LTE+ icons

CarrierConfig values have been added to better support MVNOs.
Remove the legacy resources.

Test: Make sure that marlin builds with the new carrier configs.
Bug: 113309357
Bug: 113309356
Change-Id: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316
Merged-In: I3b0af46282a4b7fc8487acfb75b5dbbb7f41d316

5 years agocorrect the definition of LISTEN_RADIO_POWER_STATE_CHANGED
chen xu [Thu, 18 Oct 2018 21:24:58 +0000 (14:24 -0700)]
correct the definition of LISTEN_RADIO_POWER_STATE_CHANGED

keep the value same as master

Bug: 117930373
Test: telephony unit test
Change-Id: I0bad21eeed2b4667fbb781253828b99332103b31
Merged-in: Id170063bfdb1e3325f67e8680231ab4deda7d65d

5 years agoMerge "expose some Telephony.Carriers cols system APIs"
Chen Xu [Fri, 19 Oct 2018 18:13:04 +0000 (11:13 -0700)]
Merge "expose some Telephony.Carriers cols system APIs"
am: f2e0f57976

Change-Id: Ifbceb368352aa1f57912b6690f61fe8412e2dc41

5 years agoRevert "Telephony light grey list clean up for Q"
Chen Xu [Fri, 19 Oct 2018 17:59:18 +0000 (17:59 +0000)]
Revert "Telephony light grey list clean up for Q"

This reverts commit 253bdb7175036472d3f75422f5bc9ac51949431e.

Reason for revert: This CL caused MMS break because Bugle is using the
hidden API in Q's darkgrey list. The proper fix should either come from
Bugle team if their apk moved to Q, or compat team to explore why this
caused issue for app target on P.

Change-Id: Icc6c190cde79c10d9045183c0b80cdf008e95578

Bug: 117899984

5 years agoMerge "Fix missing connection state changes intent for Hearing Aids"
Stanley Tng [Fri, 19 Oct 2018 17:59:53 +0000 (10:59 -0700)]
Merge "Fix missing connection state changes intent for Hearing Aids"
am: 4c7123f8e3

Change-Id: I8fd60c7a9e1458c9d391407cd53c9cd56fb5509d

5 years agoMerge "expose some Telephony.Carriers cols system APIs"
Chen Xu [Fri, 19 Oct 2018 17:56:14 +0000 (17:56 +0000)]
Merge "expose some Telephony.Carriers cols system APIs"

5 years agoMerge changes from topic "cherrypick"
Youming Ye [Fri, 19 Oct 2018 17:15:55 +0000 (10:15 -0700)]
Merge changes from topic "cherrypick"
am: c4b647458c

Change-Id: Id372458d932eb34db2f7cdc5bc25159f65f1d93c

5 years agoMerge "Fix missing connection state changes intent for Hearing Aids"
Treehugger Robot [Fri, 19 Oct 2018 17:09:34 +0000 (17:09 +0000)]
Merge "Fix missing connection state changes intent for Hearing Aids"

5 years agoadd four new carrier configs for supplementary service precautions.
SongFerngWang [Fri, 19 Oct 2018 17:08:46 +0000 (10:08 -0700)]
add four new carrier configs for supplementary service precautions.
am: 7e7c7d2abf

Change-Id: If9d738a3c9632410dc913ed08109b975e90b36a2

5 years agoMerge changes from topic "cherrypick"
Youming Ye [Fri, 19 Oct 2018 16:33:22 +0000 (16:33 +0000)]
Merge changes from topic "cherrypick"

* changes:
  Add CarrierConfig to hide "Network default" option in Caller ID setting
  add four new carrier configs for supplementary service precautions.

5 years agoMerge "Add tests for the network blocked status change"
Junyu Lai [Fri, 19 Oct 2018 16:18:38 +0000 (09:18 -0700)]
Merge "Add tests for the network blocked status change"
am: af0de1a2e9

Change-Id: I0f3f93807d9089239f572c487d791acd7a324a2e

5 years agoMerge "Add new callback to inform blocking of network on specific uid."
Junyu Lai [Fri, 19 Oct 2018 16:14:23 +0000 (09:14 -0700)]
Merge "Add new callback to inform blocking of network on specific uid."
am: f709e754ab

Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd

5 years agoMerge "Add tests for the network blocked status change"
Junyu Lai [Fri, 19 Oct 2018 15:20:48 +0000 (15:20 +0000)]
Merge "Add tests for the network blocked status change"

5 years agoMerge "Add new callback to inform blocking of network on specific uid."
Junyu Lai [Fri, 19 Oct 2018 15:20:48 +0000 (15:20 +0000)]
Merge "Add new callback to inform blocking of network on specific uid."

5 years agoMerge "Fix a bug where Uri can't parse IPv6 literal addresses."
Chalard Jean [Fri, 19 Oct 2018 12:10:55 +0000 (05:10 -0700)]
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."
am: 54677a86d4

Change-Id: Ibf681262344904990f77f9016f3ffc9efbce08ba

5 years agoAdd tests for the network blocked status change
Mike Yu [Fri, 17 Aug 2018 07:22:05 +0000 (15:22 +0800)]
Add tests for the network blocked status change

onBlockedStatusChanged is intruduced for network blocked status.
The changes in this patch are:
  - Test onBlockedStatusChanged which tells apps whether the
    network is blocked.
  - Fixed the tests which is affected by the order changed in
    onAvailable.

Test: as follows
    - runtest frameworks-net
    - runtest -x NetworkPolicyManagerServiceTest.java
Bug: 74575553
Change-Id: I383c037ed895ef69c478dc3cff69fb1e27c42845

5 years agoMerge "Fix a bug where Uri can't parse IPv6 literal addresses."
Treehugger Robot [Fri, 19 Oct 2018 11:04:29 +0000 (11:04 +0000)]
Merge "Fix a bug where Uri can't parse IPv6 literal addresses."

5 years agoFix FD leak during ADB shell install.
Chuanghua Zhao [Wed, 17 Oct 2018 12:00:04 +0000 (20:00 +0800)]
Fix FD leak during ADB shell install.

Temp fileBridge never closed before remove from bridge list,
it will cause socket FD leak during ADB install.

Improvements:
Call FileBridge#forceClose() to close FD.

Test:
1.PMS install and un-install work normal.
2.Socket FD in system_server process not increase during ADB install.

BUG: 117965848
Change-Id: I29951095f66f069263f944787875e22b666e7467

5 years agoFix missing connection state changes intent for Hearing Aids
Stanley Tng [Tue, 25 Sep 2018 22:43:41 +0000 (15:43 -0700)]
Fix missing connection state changes intent for Hearing Aids

In some corner cases, the intent receiver for hearing aids CONNECTION_STATE_CHANGED
is not registered. This fixes this problem.

Test: Manual tests with one Hearing Aid device and in Settings-Device
details page.
Bug: 116643085

Change-Id: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: I20bf6b9fe929cd8753a20b8112e66467e560f6df
Merged-In: Id2dc364dfa815e72db91b92bcee9745e6c40d34a

5 years agoMerge "Sleep 1s before force stop and use killBackgroundApp"
Mathieu Chartier [Fri, 19 Oct 2018 06:52:16 +0000 (23:52 -0700)]
Merge "Sleep 1s before force stop and use killBackgroundApp"
am: 2417859fa5

Change-Id: I92d83f16123dd16f68eb0d95d83f9dbabd493d01

5 years agoMerge "Fix current.txt"
sqian [Fri, 19 Oct 2018 06:41:46 +0000 (23:41 -0700)]
Merge "Fix current.txt"
am: 2810d0ae3e

Change-Id: I67eca70fe8d4ef7700e547de54be6d03aca492c7

5 years agoMerge "Synchronize on a static final object to lock mDeviceBusy"
Ajay Panicker [Fri, 19 Oct 2018 06:24:17 +0000 (23:24 -0700)]
Merge "Synchronize on a static final object to lock mDeviceBusy"
am: 34f9a3e9e9

Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a

5 years agoFixed unsafe lock upon safe media volume
hyomin.oh [Thu, 18 Oct 2018 04:58:27 +0000 (13:58 +0900)]
Fixed unsafe lock upon safe media volume

Safe media volume uses lock as Integer.
But it is not safe since the Integer value is changed.

disableSafeMediaVolume()
   synchronized (mSafeMediaVolumeState)  // step. 1
      setSafeMediaVolumeEnabled()
         mSafeMediaVolumeState = SAFE_MEDIA_VOLUME_ACTIVE  // step. 2
      ...
      onSetStreamVolume(mPendingVolumeCommand.mStreamType, // step.4
      -> mPendingVolumeCommand is set as null by step.3
      -> it causes NPE and reboot

------------

setStreamVolume()
   synchronized (mSafeMediaVolumeState)
   -> mSafeMediaVolumeState was changed by step.2
   -> so that it would go next step
      mPendingVolumeCommand = null;  // step. 3

Test: Build Pass, manual test, change volume
Change-Id: I33f473d42ccbf0f9b177c6886622ecc2f8020f8d

5 years agoNeed to check empty not null for String
Seongho Kim [Wed, 17 Oct 2018 03:18:17 +0000 (12:18 +0900)]
Need to check empty not null for String

getWcdmaLevel needs to check empty string, which is currently doesn't
because mWcdmaDefaultSignalMeasurement could be not null but empty string.

Test: TelephonybaseTest

Change-Id: If00a5953eef972250266ceef234cce213d45bc6a
Signed-off-by: Seongho Kim <sh_tiger.kim@samsung.com>
5 years agoFix a bug where Uri can't parse IPv6 literal addresses.
Chalard Jean [Thu, 18 Oct 2018 08:19:56 +0000 (17:19 +0900)]
Fix a bug where Uri can't parse IPv6 literal addresses.

Bug: 25540738
Test: added CTS in aosp change #793137 and ran them
Change-Id: Ibf870b7e87799090fae9ed456286c11990b01461

5 years agoAdd CarrierConfig to hide "Network default" option in Caller ID setting
taiki tsutsumi [Wed, 30 May 2018 04:50:16 +0000 (13:50 +0900)]
Add CarrierConfig to hide "Network default" option in Caller ID setting

Add a key to hide "Network default". When value is false,
"Network default" shouldn't be displayed for options in Caller ID
setting.

Test: manual - check options in Caller ID setting
Bug: 111809829
Change-Id: Id07ab2d2281a1ebb07d631045ada705cda53daf2
Merged-In: I5fbe9734dbb092b25fd145344c7559d2dee79df2

5 years agoMerge "Sleep 1s before force stop and use killBackgroundApp"
Mathieu Chartier [Fri, 19 Oct 2018 01:07:36 +0000 (01:07 +0000)]
Merge "Sleep 1s before force stop and use killBackgroundApp"