Commit Graph

530366 Commits

Author SHA1 Message Date
Jack Yu
c8716e077b Merge "Create Central Version of dataStateToString()" am: 8abad0504e am: c421bfbbb3 am: cebf61cc60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436522

Change-Id: I95fff63c457811428121188838ccbe2396ca068d
2020-09-24 17:22:23 +00:00
Jack Yu
4f2a849e25 Refactored precise data connection state
Instead of triggering the data connection state changed
event from outside, now the event is triggering from
DataConnection. Whenever detecting data connection
state changes, the event will be triggered. This significantly
reduced the unnecessary redundant events sent to telephony registry,
even though it has a duplicate detection mechanism.

This are also two behavioral changes.

1. Previously if a data connection supports multiple APN types,
there will be multiple data connection state changed event for
each APN type. Now there is only one. The listener should use
PreciseDataConnectionState.getApnSetting().getApnTypeBitmask()
to check which APN types this data connection supports.

2. If setup data call fails before a data connection instance
can be created, there won't be any event with fail cause.

Fix: 161572838
Test: FrameworksTelephonyTests and manual
Merged-In: I9723d5284c2a8fbae9f63179dc30ddc42da1d0fc
Change-Id: I9723d5284c2a8fbae9f63179dc30ddc42da1d0fc
(cherry picked from commit 34a09a4cbd)
2020-09-24 09:57:50 -07:00
Jack Yu
cebf61cc60 Merge "Create Central Version of dataStateToString()" am: 8abad0504e am: c421bfbbb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436522

Change-Id: Ie2c6d8b48c2652e0883d728d33039cb3b131f2cc
2020-09-24 16:55:02 +00:00
Jack Yu
b5d6274622 Added transport type and id in precise data connection state
Added the transport type in precise data connection state. This
would be useful for IWLAN, MAPCON, and 5G development work. Also
added id for listener to keep tracking the same data connection
state.

Bug: 161572838
Test: FrameworksTelephonyTests
Merged-In: I5a14610bf072a64b534227fb715ebec58716bce0
Change-Id: I5a14610bf072a64b534227fb715ebec58716bce0
(cherry picked from commit ec5093d4d7)
2020-09-24 09:36:15 -07:00
Jack Yu
7c4b48f0e5 Removed APN name and types from PreciseDataConnectionState
The APN name and type bitmasks should come from APN setting.
Also fixed a regression caused by ag/9931487 that the APN
field in precise data connection state is changed to APN type in
string, instead of the APN name.

Bug: 161572838
Test: FrameworksTelephonyTests
Merged-In: If19980be29c13c783f1964d3fce9505a08570f7e
Change-Id: If19980be29c13c783f1964d3fce9505a08570f7e
(cherry picked from commit c42172ece7)
2020-09-24 09:36:15 -07:00
Jack Yu
47262c052b Added builder for PreciseDataConnectionState
Added builder for PreciseDataConnectionState. No functionality
changed.

Bug: 161572838
Test: FrameworksTelephonyTests
Merged-In: I9d2d4cc3d717878d9246989f7a88bedc0805d86e
Change-Id: I9d2d4cc3d717878d9246989f7a88bedc0805d86e
(cherry picked from commit 9919a2925e)
2020-09-24 09:36:15 -07:00
Nathan Harold
bf5158f9a0 Remove Deprecated-At-Birth APIs from PDCS
Two APIs were added as @SystemApi and then @Deprecated within
the same API level (RVC). These methods were never exposed
publicly, and instead were replaced with more-appropriate
named methods that were added to the public API. As such they
were not fully deleted in RVC but were never exposed and expected
to be deleted following SDK finalization. This CL does precisely
that - removes all traces of these methods, as per the will of
the API Council.

-Remove #getDataConnectionLinkProperties()
-Remove #getDataConnectionNetworkType()

Bug: 152787887
Test: make update-api && make
Merged-In: I89463b0bd641e9316f90fe4f535d326f6e74a061
Change-Id: I89463b0bd641e9316f90fe4f535d326f6e74a061
(cherry picked from commit 3a47293cb4)
2020-09-24 09:36:15 -07:00
Jack Yu
c421bfbbb3 Merge "Create Central Version of dataStateToString()" am: 8abad0504e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436522

Change-Id: Ia3fc57e42b5433f6ccbc3841877d46a0c420ea2c
2020-09-24 16:23:22 +00:00
Fabian Kozynski
36cbc4ac67 Add Executors to Dependency
Test: manual, trigger KeyguardBottomAreaView#launchVoiceAssist
Fixes: 167421921
Change-Id: I9b366f2fb69f47e0fb7bf19ced0c5382d0bb9c7c
2020-09-24 12:13:55 -04:00
Jack Yu
8abad0504e Merge "Create Central Version of dataStateToString()" 2020-09-24 16:07:57 +00:00
Wang Han
fcf671890f Fix setType() return value for high angle sensor
Change-Id: I712fd77f8079fc17c45dcbc1c2fdf1be72d338f2
2020-09-24 13:16:18 +00:00
Anton Hansson
73aa2509ef Baseline existing API lint warnings
We are making warnings behave as errors (i.e. break the build).
Rather than fixing all the current warnings, just baseline them.

This CL is the result of
$ m
$ cp \
out/soong/.intermediates/frameworks/base/system-api-stubs-docs/android_common/api_lint_baseline.txt \
frameworks/base/api/system-lint-baseline.txt
$ cp \
out/soong/.intermediates/frameworks/base/test-api-stubs-docs/android_common/api_lint_baseline.txt \
frameworks/base/api/test-lint-baseline.txt"

Bug: 154317059
Test: m
Change-Id: Idf8f7dbcaa1c136781175fd5e66eed3525d21722
Merged-In: Idf8f7dbcaa1c136781175fd5e66eed3525d21722
2020-09-24 14:04:51 +01:00
guofei.xue
813857d851 When the mUri is null,it will happen NullPointerException.
When test the monkey, the mUri is existed to be null pointer high probability.

In order to prevent a null pointer exception, added a judgment condition that the mUri is not null or empty.

Test:Perform the monkey test,and See if this NullPointerException will happen again when call the method of android.media.Ringtone#play.

Bug: 169292270

Change-Id: I7907f0a376d67bb0a0f50ea155e2aa2f4552b1de
2020-09-24 11:46:35 +00:00
Remi NGUYEN VAN
2b79bd6e27 Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26e0 am: b16646a949 am: a63fbe8200
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924

Change-Id: Ib7d695934eb69c8e49e690d3d85198cf6f7b9ff4
2020-09-24 09:12:13 +00:00
Remi NGUYEN VAN
a63fbe8200 Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26e0 am: b16646a949
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924

Change-Id: I7229dab0c6246f9fbb6724456d9ada6064d3f31a
2020-09-24 08:52:46 +00:00
Remi NGUYEN VAN
b16646a949 Merge "Remove unused testutils lib from tethering tests" am: 5fad8b26e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433924

Change-Id: I30a1542c1fe2056d074402f2b5f7be2a37f15373
2020-09-24 08:35:35 +00:00
Remi NGUYEN VAN
5fad8b26e0 Merge "Remove unused testutils lib from tethering tests" 2020-09-24 08:16:21 +00:00
lucaslin
bceef6f423 Add synchronized to make sure data correctness
Both mNetworkAgent and mConfig are mutable, add synchronized to
make sure the data correctness of those two vars when getNetId()
and getVpnConfig() are called.

Bug: 168576152
Test: atest FrameworkNetTests
      atest CtsHostsideNetworkTests:HostsideVpnTests
Change-Id: I4133de84c904009b5fbf4208853773fc79fdd17f
2020-09-24 07:13:48 +00:00
Stephane Lee
f2bfb467e9 BatteryStatsImpl: Add mBatteryTimeToFull to parcel
Bug: 163342637
Test: Ensure that both Settings/SystemUI ttf are synchronized
Change-Id: I66121858972bc110c9d7422348ea0217e4e3862d
Merged-In: I844149d4787e3aef7808bb4f85b0f08d179c5c41
(cherry picked from commit 4b967a454e)
2020-09-23 23:34:42 -07:00
Arc Wang
522ea42608 Merge "Modify Wi-Fi SettingsLib owners file" am: d2aa5c594b am: daec1e65cd am: 5da80571ba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432794

Change-Id: I216b3dcfeb4033741ea987354625096b61d44d19
2020-09-24 05:43:47 +00:00
Arc Wang
5da80571ba Merge "Modify Wi-Fi SettingsLib owners file" am: d2aa5c594b am: daec1e65cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432794

Change-Id: I9123cc8cfa5c0e247791afab59375dfc19c9f58a
2020-09-24 04:53:22 +00:00
Nathan Harold
42f5c3e326 Create Central Version of dataStateToString()
There are currently two slightly-different copies of
dataStateToString().
-TelephonyManager#dataStateToString()
-TelephonyRegistry#dataStateToString()

The TelephonyRegistry version doesn't have a string for the
DISCONNECTING state. In order to have a single copy that can
be accessed from TelephonyRegistry (not mainline) and TelephonyManager
(mainline), move both copies to TelephonyUtils.

Bug: 149717408
Test: make; atest TelephonyRegistryTest
Merged-In: I36945a8a432f7b4f0c449f7414996372e852b5b8
Change-Id: I36945a8a432f7b4f0c449f7414996372e852b5b8
(cherry picked from commit b640b1c62b)
2020-09-23 21:47:00 -07:00
Arc Wang
daec1e65cd Merge "Modify Wi-Fi SettingsLib owners file" am: d2aa5c594b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432794

Change-Id: I67609c82cf201037f11fefe48c9289470f261fd7
2020-09-24 04:29:37 +00:00
Junyu Lai
c2cc33a706 Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4 am: 65bcfe173f am: b3692b0365
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190

Change-Id: I0d55c6f7e876a786cbe7f301d0caecbe6456af36
2020-09-24 04:19:43 +00:00
Arc Wang
d2aa5c594b Merge "Modify Wi-Fi SettingsLib owners file" 2020-09-24 04:08:01 +00:00
Junyu Lai
b3692b0365 Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4 am: 65bcfe173f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190

Change-Id: I31a6290db41be9f003646067e76c7ed901ade7ae
2020-09-24 04:03:12 +00:00
Junyu Lai
65bcfe173f Merge "Skip stop if keepalive is already in stopping state" am: cb79f645d4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190

Change-Id: I44f945f1804938819506dab56063d2706b27fcfd
2020-09-24 03:04:20 +00:00
Junyu Lai
cb79f645d4 Merge "Skip stop if keepalive is already in stopping state" 2020-09-24 02:45:09 +00:00
markchien
de20bb0e39 Fix TetheredClient callback fail in InProcessTethering
TetheredClient callback would additional check whether caller has
NETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not
grant for self accessing. InProcessTethering run in system server, so
the services in system server would fail to call TetheredClient callback.
Grant permission for self process.

Bug: 169231588
Test: atest CtsTetheringTest
Change-Id: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
2020-09-24 10:11:51 +08:00
HsingYuan Lo
762a05f057 Expose service changed event to application (2/3)
Handle service changed event from GattService

Bug: 154056389
Tag: #feature
Test: test service changed scenario
Change-Id: If56dcbd7cf17b23c88cceb9c67c5d75b21320965
2020-09-24 09:27:58 +08:00
Treehugger Robot
ee6c5882a1 Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe am: e34fa22622 am: 824a6b93c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648

Change-Id: I15b4bc73cadc3a90fe577759b2da6931ab9ea864
2020-09-24 00:59:02 +00:00
Treehugger Robot
824a6b93c8 Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe am: e34fa22622
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648

Change-Id: I0da0bd777346cf53d89be6d4347d3ccef07f9385
2020-09-24 00:48:40 +00:00
Steven Moreland
d243d23f84 ServiceManager: add getDeclaredInstances
Corresponding to change in IServiceManager API, for finding out what
instances of a VINTF service are installed.

Bug: 168715768
Test: manual
Change-Id: Ic54b0cfd1bd42e45dc66858dbd614db7ba22083f
2020-09-24 00:46:56 +00:00
Treehugger Robot
e34fa22622 Merge "Update language to comply with Android's inclusive language guidance" am: 48c50ccdfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426648

Change-Id: I5b1d2fb0544011d23f93f2390bdb639f0fd5ee77
2020-09-23 23:52:42 +00:00
Treehugger Robot
48c50ccdfe Merge "Update language to comply with Android's inclusive language guidance" 2020-09-23 23:30:57 +00:00
Treehugger Robot
c8df560b39 Merge "Add nona@ to hwui owners for text related files" am: 4eec88d3d5 am: b378ed4b97 am: ddddd7b3d0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435731

Change-Id: I47c11e7d908399c7f5a03f71dd0dc14da950c9e4
2020-09-23 21:49:01 +00:00
Alec Mouri
34ee4da805 [automerger skipped] Merge "Support dispatchNullEvent virtual method" am: 9b0577d0b8 am: 8af52d1f98 am: 455a1f42de -s ours
am skip reason: Change-Id Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb with SHA-1 1315f1105e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434522

Change-Id: I0c9be1d3251fce4646d1248db2dd15d261780ccc
2020-09-23 21:48:39 +00:00
Treehugger Robot
ddddd7b3d0 Merge "Add nona@ to hwui owners for text related files" am: 4eec88d3d5 am: b378ed4b97
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435731

Change-Id: I49e714d1fb85850f2136adb79c9a583ab2150357
2020-09-23 21:40:23 +00:00
Alec Mouri
455a1f42de Merge "Support dispatchNullEvent virtual method" am: 9b0577d0b8 am: 8af52d1f98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434522

Change-Id: I9bbc4110c5edb415fb22fc592ebc6924e8e1b872
2020-09-23 20:55:34 +00:00
Treehugger Robot
b378ed4b97 Merge "Add nona@ to hwui owners for text related files" am: 4eec88d3d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435731

Change-Id: Ic9bd5aae52b2de9bcfd67a2574054e82e020efa4
2020-09-23 20:55:09 +00:00
Treehugger Robot
4eec88d3d5 Merge "Add nona@ to hwui owners for text related files" 2020-09-23 20:44:02 +00:00
Alec Mouri
8af52d1f98 Merge "Support dispatchNullEvent virtual method" am: 9b0577d0b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434522

Change-Id: I7aa01fe7c4635e2a798771c4570d0b96c3dd01f6
2020-09-23 20:31:43 +00:00
Alec Mouri
9b0577d0b8 Merge "Support dispatchNullEvent virtual method" 2020-09-23 20:16:28 +00:00
Alec Mouri
0a012afd4a Support dispatchNullEvent virtual method
Added for AChoreographer in I66abc2e28e60f06987ce3a54be294c94b77524fc

Bug: 154874011
Bug: 158680912
Bug: 161406626
Bug: 168776852
Test: builds
Change-Id: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
Merged-In: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
2020-09-23 20:11:29 +00:00
Suren Baghdasaryan
29711d8cba Merge "Report ION usage event when ION heap size is 0" am: 7687adc00d am: d493ed705b am: da855f3363
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431373

Change-Id: I0abb5aebd750732e01a101cce8b9a7f80ebd9d51
2020-09-23 20:03:14 +00:00
Suren Baghdasaryan
da855f3363 Merge "Report ION usage event when ION heap size is 0" am: 7687adc00d am: d493ed705b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431373

Change-Id: I11cfef78933c1978919b6e85bc0ebf817993d73a
2020-09-23 18:25:44 +00:00
Suren Baghdasaryan
d493ed705b Merge "Report ION usage event when ION heap size is 0" am: 7687adc00d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431373

Change-Id: I63145aea8d511ad773fb4ea186b09f278559bd8a
2020-09-23 17:49:37 +00:00
Seigo Nonaka
6962a61a1f Add nona@ to hwui owners for text related files
Bug: N/A
Test: N/A
Change-Id: I60b99c1b50073137eae7547b153a4ab254cde427
2020-09-23 10:49:28 -07:00
Suren Baghdasaryan
7687adc00d Merge "Report ION usage event when ION heap size is 0" 2020-09-23 17:33:31 +00:00
Ulyana Trafimovich
2dc7803823 Merge "Drop dependency of android.test.mock -> android.test.base." am: f08e8871d4 am: 72003fb685 am: 10e02f55c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1434135

Change-Id: I2739873d55b2cff1f5ecc722e1877603ba6e22c6
2020-09-23 16:30:27 +00:00