Automerger Merge Worker
6c14dd9c44
Merge "Expose NetworkCapabilities methods to system/public APIs" am: 30b2ac7158 am: 435b410600
...
Change-Id: Id97144cf1421f5256748a196df37f58ffd006859
2019-12-27 08:45:44 +00:00
Aaron Huang
435b410600
Merge "Expose NetworkCapabilities methods to system/public APIs"
...
am: 30b2ac7158
Change-Id: Icb3d0559475a14130dea64a5ca49a6259d5a2eb9
2019-12-27 00:38:46 -08:00
Aaron Huang
30b2ac7158
Merge "Expose NetworkCapabilities methods to system/public APIs"
2019-12-27 08:32:50 +00:00
Aaron Huang
e6b62391da
Expose NetworkCapabilities methods to system/public APIs
...
Add methods to system/public APIs for mainline support.
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest FrameworksNetTests
atest NetworkStackTests
./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
atest FrameworksTelephonyTests
atest android.net.cts
atest android.net.wifi.cts
atest android.telephony.cts
Change-Id: I6ec333309172edaf5aa976f83cfbe63512043594
2019-12-27 08:31:06 +00:00
Nathan Harold
801bfb0d80
Merge "Expose PreciseDataConnectionState to Public API"
...
am: 47fbf0aaa0
Change-Id: I748243b2ebc02c6c750b83b722e5b38cf8fcf26e
2019-12-26 15:10:18 -08:00
Nathan Harold
47fbf0aaa0
Merge "Expose PreciseDataConnectionState to Public API"
2019-12-26 23:05:58 +00:00
Automerger Merge Worker
162fb37428
Merge "Camera: Fix typo when comparing display size height" into qt-qpr1-dev am: 870f67cc63
...
Change-Id: I74bd4ba4084d10f5e8ea866cc06799c52372e10e
2019-12-26 17:33:22 +00:00
TreeHugger Robot
870f67cc63
Merge "Camera: Fix typo when comparing display size height" into qt-qpr1-dev
2019-12-26 17:16:35 +00:00
Automerger Merge Worker
14d9520d80
Merge "Make MatchAllNetworkSpecifier constructor @SystemApi" am: 9dd0968ca1 am: 011eb06659
...
Change-Id: I8d0be2c9deff0f48842f8a3bb3c4a685ffe2e095
2019-12-25 09:15:35 +00:00
Aaron Huang
011eb06659
Merge "Make MatchAllNetworkSpecifier constructor @SystemApi"
...
am: 9dd0968ca1
Change-Id: I91420e99ce40526133ba6803ef0087b0316f61b4
2019-12-25 01:04:09 -08:00
Aaron Huang
9dd0968ca1
Merge "Make MatchAllNetworkSpecifier constructor @SystemApi"
2019-12-25 08:07:00 +00:00
Automerger Merge Worker
3990bf8ba0
Merge "ServiceManagerProxy: New method implementations" am: b2d8eb58a2 am: b88261b982
...
Change-Id: Ieef272563ab13c9bad7b7f062f2778bb2a7062d1
2019-12-23 20:22:53 +00:00
Jon Spivack
b88261b982
Merge "ServiceManagerProxy: New method implementations"
...
am: b2d8eb58a2
Change-Id: Ib572a6702fbf4aca5277f2d385a3ce6359d71851
2019-12-23 12:11:22 -08:00
Jon Spivack
b2d8eb58a2
Merge "ServiceManagerProxy: New method implementations"
2019-12-23 20:04:33 +00:00
Automerger Merge Worker
f96069b311
Merge changes I4af73809,Iba6a564a,I3305b71e am: 5640e1d836 am: 91ccb1b309
...
Change-Id: I9a7b50482d2354710f85141fec0bbf9d980b4711
2019-12-22 08:35:11 +00:00
Jiyong Park
91ccb1b309
Merge changes I4af73809,Iba6a564a,I3305b71e
...
am: 5640e1d836
Change-Id: Ia0bfa4b3135a12f2e38438f192baa6ebb641bc4b
2019-12-22 00:20:17 -08:00
Jiyong Park
5640e1d836
Merge changes I4af73809,Iba6a564a,I3305b71e
...
* changes:
Hide com.android.server package with @hide javadoc tag
Add more enums for the client and process attributes of SystemApi
SystemApi is parameterized
2019-12-22 08:15:25 +00:00
Automerger Merge Worker
04e221f3f9
Merge "Exposing voice connection status system APIs as public API" am: 96e8628049 am: 55cc8b27b8
...
Change-Id: Ic43b8d82f5caeca0a7339d77f4f53bebc408d871
2019-12-21 02:51:34 +00:00
Shi Lu
55cc8b27b8
Merge "Exposing voice connection status system APIs as public API"
...
am: 96e8628049
Change-Id: I222a9a2b44050825a4553b4b7baa7dfe7de3e046
2019-12-20 18:39:56 -08:00
Shi Lu
96e8628049
Merge "Exposing voice connection status system APIs as public API"
2019-12-21 02:31:36 +00:00
Automerger Merge Worker
8d0af4a6a9
Merge "Replace import with fully qualified javadoc." am: 31a7838fb1 am: 1d5eed4cb0
...
Change-Id: I0f1e36b55517c9d875c5351f39940ed4742f3acd
2019-12-20 22:30:59 +00:00
Jeff Sharkey
1d5eed4cb0
Merge "Replace import with fully qualified javadoc."
...
am: 31a7838fb1
Change-Id: I1ede620fad6dfe3debb7156bf882a27402bfb5d9
2019-12-20 14:15:54 -08:00
Automerger Merge Worker
3bb284492d
Support @left marker am: 21cc2e5f7d
...
Change-Id: I55bc7ee5b21dd5cf34da5944c7fad8169a34ca6d
2019-12-20 22:06:01 +00:00
Jeff Sharkey
20d6f2e6e1
Replace import with fully qualified javadoc.
...
Some internal changes are depending more strongly on annotations
being "leaves" which don't directly reference other parts of the OS,
so replace the direct import of Intent with a qualified javadoc
reference.
Bug: 144247087
Test: atest --test-mapping packages/providers/MediaProvider
Change-Id: I198d84a755b5e270a19b41328f6a6e152112c40a
Merged-In: I198d84a755b5e270a19b41328f6a6e152112c40a
2019-12-20 14:01:43 -07:00
Lucas Dupin
21cc2e5f7d
Support @left marker
...
By default cutouts are centered and support a @right marker to allow
them to be right aligned. Let's also support left alignment by
introducing a @left marker.
Test: atest DisplayCutoutTest
Test: manual
Bug: 143222961
Bug: 145707162
Change-Id: Ic5a645bd9f0513f3665f31c8b0f1861585bf30e6
Merged-In: Ic5a645bd9f0513f3665f31c8b0f1861585bf30e6
(cherry picked from commit 6e9636c5e0 )
2019-12-20 20:21:25 +00:00
Nathan Harold
d9b5dda461
Expose PreciseDataConnectionState to Public API
...
1) Remove Unused Parameters for onDataConnectionState:
The data connection state broadcast includes a number of
parameters that are never used anywhere. To prepare for
updated code that relies on PreciseDataConnectionState,
remove the unused parameters that were internal-only and
included in the broadcast.
-LinkProperties
-NetworkCapabilities
-DataRoaming
-DataAllowed
-Interface name
2) Add Disconnecting State for Data Connections
Add a disconnecting state to correct a mismatch
between the internal and externally visible enums.
This will allow apps to know when connections are
in the process of being torn down, which in the case
of radio link issues could be as much as 15 seconds.
3) Expose PreciseDataConnection for Carrier Apps
Exposes the PSL for PreciseDataConnectionState along
with existing fields in the PreciseDataConnectionState
class.
-Make PreciseDataConnectionState public along with some
of its fields.
-Expose onPreciseDataConnectionStateChanged.
-Add onPreciseDataConnectionStatesChanged to provide PDCS
for all APNs in one cohesive batch.
4) Cache PreciseDataConnectionState by APN Type
In telephony registry, multiple different APN types
are all piped through the same cache entry, so every
time any APN changes relative to the previous type,
it triggers an update. This also means that when
a registrant requests the data connection state, only
the most recent type's state is updated.
This change caches entries in TelephonyRegistry based
on the APN's type (specifically the type among types
which triggered the change).
Bug: 143083105
Test: make update-api && make offline-sdk-docs
(no functional change in this CL).
Test: atest FrameworksTelephonyTests
Merged-In: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
Change-Id: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
(cherry picked from commit 4d340f12c9 )
(cherry picked from commit c95b4e5421 )
2019-12-20 10:06:54 -08:00
TreeHugger Robot
a251173a1c
Merge "Revert "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn"" into qt-qpr1-dev-plus-aosp
2019-12-20 17:55:45 +00:00
Automerger Merge Worker
08074c62b0
Merge "[Tether13] Move TetheringManager into framework" am: 2410d67357 am: 25cc1f47c5
...
Change-Id: I9ec25eb984e3b534ddcc9313836a319b21526998
2019-12-20 14:00:29 +00:00
Mark Chien
25cc1f47c5
Merge "[Tether13] Move TetheringManager into framework"
...
am: 2410d67357
Change-Id: I05c79a1cf07e7679ea2a2c9221e541fb1c9a5a23
2019-12-20 05:47:01 -08:00
Mark Chien
2410d67357
Merge "[Tether13] Move TetheringManager into framework"
2019-12-20 13:43:46 +00:00
Remi NGUYEN VAN
6b6a9b1972
Merge "Fix parceling of LinkProperties Inet6Addr" into qt-qpr1-dev
2019-12-20 08:27:55 +00:00
Automerger Merge Worker
afc127664e
Log watchdog-initiated rollback reason am: 254b0d5a7f
...
Change-Id: I2487bca4fd0579c2f66de15da727ada54a26cfe1
2019-12-20 08:18:37 +00:00
Gavin Corkery
cb6ad6dc8e
Merge changes from topic "cp-log-watchdog" into qt-qpr1-dev
...
* changes:
Log native crashing process
Log watchdog-initiated rollback reason
Add package failure flags to Package Watchdog
2019-12-20 08:02:11 +00:00
Automerger Merge Worker
b70662d510
Merge "Provide APIs to get preferred payment service information" am: c0c28a2671 am: e7bfadcb7d
...
Change-Id: I6594c36891f2f4f644ee1d154989465459752ef0
2019-12-20 03:25:38 +00:00
Jack Yu
e7bfadcb7d
Merge "Provide APIs to get preferred payment service information"
...
am: c0c28a2671
Change-Id: I632a657c5342fbc4f30aae515b842a66c0ad6abd
2019-12-19 19:10:35 -08:00
Treehugger Robot
c0c28a2671
Merge "Provide APIs to get preferred payment service information"
2019-12-20 03:05:13 +00:00
Automerger Merge Worker
91bc7be712
Merge "Use sysprop library for telephony props" am: afb16fa9d4 am: dc4de88fec
...
Change-Id: Iae5ca6c30dd3a72d5da921cf45d9c282bcff2703
2019-12-20 02:22:19 +00:00
Inseob Kim
dc4de88fec
Merge "Use sysprop library for telephony props"
...
am: afb16fa9d4
Change-Id: Ieeb580cd47e4210c9cb9edea4a0b561b73420040
2019-12-19 18:03:38 -08:00
Treehugger Robot
afb16fa9d4
Merge "Use sysprop library for telephony props"
2019-12-20 02:00:38 +00:00
Nathan Harold
dcbe98371e
Revert "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn"
...
This reverts commit d80dc8fed4 .
Bug: 143082463
Test: compilation
Merged-In: Ib6a769f5a0cae923ca47a842733bd28755a90ed5
Change-Id: I455788f72fc6dec23c0d0d24a1ca8ee9c2f637c9
2019-12-19 17:37:54 -08:00
Noah Zimmt
2115c17ced
Merge "[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn" into qt-qpr1-dev-plus-aosp
2019-12-20 00:45:42 +00:00
Noah Zimmt
d80dc8fed4
[DO NOT MERGE] Revert submission 9950791-pick-precise-dataconn
...
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_cf_x86_phone-userdebug&lkgb=6087936&lkbb=6087980&fkbb=6087980 , b/146588413
Reverted Changes:
I8445808a0: Expose PreciseDataConnectionState to Public API
Ib6a769f5a: Expose PreciseDataConnectionState to Public API
Note: These CLs are correctly applied in master already.
The revert should merge to qt-qpr1-dev-plus-aosp only
Change-Id: If98f8ba5f20073bade40f7b167ed185c2e4c0e1b
2019-12-20 00:43:41 +00:00
Automerger Merge Worker
a9a1cc68f7
Merge "Do not setSubId on SmsMessage." am: 0330797929 am: 50080aa1ae
...
Change-Id: I2f08915cb59ae1999922ca4bc874b9d1903fc053
2019-12-20 00:26:55 +00:00
Automerger Merge Worker
0b11673991
Merge "Add an API to tell whenever device supports userspace reboot" am: 670352e807 am: d1c0e074c0
...
Change-Id: I5e51be225c3063e250facec51cf4976c3004acc4
2019-12-20 00:26:24 +00:00
Automerger Merge Worker
402f7eb3fb
Merge "Use write_buffer_to_statsd within StatsLog_write" am: 634f6969c4 am: 4f32e393d0
...
Change-Id: Ie91b0cceab48051c53f8e7270a5a267c5778a82d
2019-12-20 00:24:50 +00:00
Meng Wang
50080aa1ae
Merge "Do not setSubId on SmsMessage."
...
am: 0330797929
Change-Id: I7b7eb6c747ce7e9f82f0125519a6bc2fafaa3ef2
2019-12-19 16:19:24 -08:00
Nikita Ioffe
d1c0e074c0
Merge "Add an API to tell whenever device supports userspace reboot"
...
am: 670352e807
Change-Id: I6706acb0d2d396b1870813e692c3124da92e4b7f
2019-12-19 16:11:37 -08:00
Muhammad Qureshi
4f32e393d0
Merge "Use write_buffer_to_statsd within StatsLog_write"
...
am: 634f6969c4
Change-Id: Iddc845d267e8bd5b54bd95caa184fb27bbdab606
2019-12-19 16:04:27 -08:00
Meng Wang
0330797929
Merge "Do not setSubId on SmsMessage."
2019-12-19 23:47:22 +00:00
Nikita Ioffe
670352e807
Merge "Add an API to tell whenever device supports userspace reboot"
2019-12-19 23:44:06 +00:00