Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
472,202 Commits 3 Branches 0 Tags
ead4e2a9207e08af651f5eefc56bcdccd26bf4e2
Commit Graph

29609 Commits

Author SHA1 Message Date
Automerger Merge Worker
9dc11fe8fd Merge "Add "name" to RoutingSessionInfo" into rvc-dev am: a448f383d0 am: 1e6d587d12 
Change-Id: Id32af246fba4d8994ef020efde7ce08becc16711
 2020-03-02 03:17:47 +00:00
Kyunglyul Hyun
a448f383d0 Merge "Add "name" to RoutingSessionInfo" into rvc-dev 2020-03-02 02:42:28 +00:00
Automerger Merge Worker
1b74f97c44 Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into rvc-dev am: bba804e8f5 am: a83e139d9a 
Change-Id: I62c48009959cc5d2a0d08cfb7d7d51ce1161b0c7
 2020-02-29 13:31:20 +00:00
TreeHugger Robot
bba804e8f5 Merge "Rename setMeteredOverridePasspoint to setPasspointMeteredOverride" into rvc-dev 2020-02-29 13:07:55 +00:00
Automerger Merge Worker
900a13b146 Merge "API review: setNetworkSelectionModeManual" into rvc-dev am: be776fed5e 
Change-Id: Ib77809d8dc56e79233c86d52fd97dfbd233c60d6
 2020-02-29 04:52:28 +00:00
Sarah Chin
be776fed5e Merge "API review: setNetworkSelectionModeManual" into rvc-dev 2020-02-29 04:49:13 +00:00
Sarah Chin
1f39ebd9e6 API review: setNetworkSelectionModeManual 
Move optional ran parameter to end
Make system -> public API

Test: atest FrameworksTelephonyTests
Bug: 150127236
Change-Id: I140477b2778158646dbbcb0d2a32033c61bb97e4
 2020-02-28 15:13:16 -08:00
Automerger Merge Worker
e576678a0a Merge "Re-order parameters of setUiccApplicationsEnabled." into rvc-dev am: 8972b83893 
Change-Id: I4853336353ecf654b0743786ac22a4f378ca0056
 2020-02-28 22:34:19 +00:00
Automerger Merge Worker
7077ef6893 Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev am: 5f3331df90 
Change-Id: I1f088b19eb9eb00107bc8b26a4193a4a1892d4e6
 2020-02-28 22:33:51 +00:00
Automerger Merge Worker
e4077f8bfc Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev am: 01f0e8f0c3 
Change-Id: Ieeec77d1d96adffa26d7d1ef35d1d609e83c869c
 2020-02-28 22:33:02 +00:00
Xiangyu/Malcolm Chen
8972b83893 Merge "Re-order parameters of setUiccApplicationsEnabled." into rvc-dev 2020-02-28 22:22:26 +00:00
TreeHugger Robot
5f3331df90 Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev 2020-02-28 22:17:28 +00:00
TreeHugger Robot
01f0e8f0c3 Merge "Make createLocationInfoSanitizedCopy as @hide." into rvc-dev 2020-02-28 22:16:45 +00:00
Automerger Merge Worker
5a9cb168e1 Merge changes I7ac3a378,Id06a24d2 into rvc-dev am: e4beb133e6 
Change-Id: Ife8af09a2f345507aa4ee0ecbe395ead095d3987
 2020-02-28 19:27:24 +00:00
Automerger Merge Worker
9b726e7ac6 Merge "[API Review] Expose sendOrderedBroadcast" into rvc-dev am: 879f32b1cc 
Change-Id: I95174ab61dea2c06e5eb596f0987ed34298cd972
 2020-02-28 19:26:59 +00:00
Matt Pietal
e4beb133e6 Merge changes I7ac3a378,Id06a24d2 into rvc-dev 
* changes:
  Controls API - Docs + method name change
  Controls API - Publisher change - Phase 2
 2020-02-28 19:06:28 +00:00
Peter Wang
879f32b1cc Merge "[API Review] Expose sendOrderedBroadcast" into rvc-dev 2020-02-28 19:05:26 +00:00
Quang Luong
aa06e85a29 Rename setMeteredOverridePasspoint to setPasspointMeteredOverride 
Renaming as per Android API Council request.

Bug: 150204647
Test: build
Change-Id: Id6c40eef43ce765fe379af68144d342413d3daa4
 2020-02-28 11:04:52 -08:00
Automerger Merge Worker
abfa218340 Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177 
Change-Id: If54b64a93020bac289b754c5f108d2ef4e23a637
 2020-02-28 11:41:44 +00:00
TreeHugger Robot
fde0af9177 Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev 2020-02-28 11:38:39 +00:00
Hyundo Moon
899535c9ff Make MediaRouter2 callback classes as abstract 
This is per API review.

Bug: 149912538
Test: Ran CTS and atest mediaroutertest
Change-Id: Id52bb7b06da4f414099607b1bde781005e47ded3
 2020-02-28 18:27:42 +09:00
Automerger Merge Worker
0b64d65f28 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: d74f557cbf 
Change-Id: I64f6f64c643e626380403d3e15c6ed4b5f2330ef
 2020-02-28 03:04:11 +00:00
Automerger Merge Worker
d74f557cbf Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df 
Change-Id: Idd4eca225909f88ef6d57fd8952ae497ec82115b
 2020-02-28 02:49:58 +00:00
Lorenzo Colitti
41c82c99df Merge "Fix crash and duplicated ethernet tethering request" 2020-02-28 02:37:45 +00:00
Malcolm Chen
f0af4a6995 Re-order parameters of setUiccApplicationsEnabled. 
To be consistent with other APIs, based on API council's feedback.

Bug: 148179539
Test: build
Change-Id: I1d4a2bf7dfc01842f583e02517986a8bf043bfde
Merged-In: I1d4a2bf7dfc01842f583e02517986a8bf043bfde
 2020-02-27 20:09:32 +00:00
Automerger Merge Worker
105fb4d00a Merge "Change Context parameter to @NonNull." am: ba07b06d19 
Change-Id: I1245d557bc08aa9bcf9babfe226ad6f245f57a68
 2020-02-27 19:15:48 +00:00
Amit Mahajan
ba07b06d19 Merge "Change Context parameter to @NonNull." 2020-02-27 19:02:14 +00:00
Automerger Merge Worker
ff4d31eabd Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 
Change-Id: I41abdb3958da056ce8a58fb353af07310b370ea3
 2020-02-27 18:31:01 +00:00
Amit Mahajan
cc7682bd15 Merge "Hide TelephonyRegistryManager." into rvc-dev 2020-02-27 18:25:29 +00:00
Automerger Merge Worker
b84b8d1585 Merge "Remove the public APIs for allow rich content." into rvc-dev am: 2ebe60b5df 
Change-Id: Ib2b98a1ba9f8dc7dfa78f1bbfb611f68da69ef6d
 2020-02-27 10:42:25 +00:00
Kyunglyul Hyun
d02172c6e6 Add "name" to RoutingSessionInfo 
The name of dynamic group can be set by providers.

Bug: 150249359
Test: cts tests
Change-Id: I1b74fe5b7976eb0ad6a52fd29203446dde480de8
 2020-02-27 19:12:10 +09:00
markchien
d2d8d45b89 Fix crash and duplicated ethernet tethering request 
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: I7c5127e96d80d077735010d2e62c7227805ccb10
 2020-02-27 14:50:16 +08:00
Automerger Merge Worker
e1d888d66b Merge changes from topics "caps_refactor", "phone-cap-revert" am: 1bd0e487cd 
Change-Id: I7ab7fe2cceeeb57bb60fdab15eb3f96fb7b4d601
 2020-02-27 06:05:45 +00:00
Sarah Chin
1bd0e487cd Merge changes from topics "caps_refactor", "phone-cap-revert" 
* changes:
  Revert "Modify PhoneCapabilities for device capabilities"
  Revert "PhoneCapability cleanup"
 2020-02-27 05:46:08 +00:00
Peter_Liang
01a592bfd1 Remove the public APIs for allow rich content. 
1. Mark @hide for "Drawable loadAnimatedImage(Context)" and "String loadHtmlDescription(PackageManager)".
2. Move common function into util.

Bug: 149516547
Bug: 142532186
Test: maunal test
Change-Id: I4f734a496938f64bcde990268e11a2d1a5be4771
Merged-In: I4f734a496938f64bcde990268e11a2d1a5be4771
(cherry picked from commit a2f7f84938)
 2020-02-27 04:19:53 +00:00
Automerger Merge Worker
73f40b8b72 Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev am: 8e5e4e03a9 
Change-Id: I232254dd0f3f094b600f60c8e4baf4f4fde43dcf
 2020-02-27 04:08:21 +00:00
TreeHugger Robot
8e5e4e03a9 Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev 2020-02-27 04:04:35 +00:00
Automerger Merge Worker
33086f9d78 Merge "Add methods to send connected/disconnected state." am: bdb86ff8ab 
Change-Id: If69bd650e129dc9f058e47832d48651b9243a3bb
 2020-02-27 03:23:48 +00:00
Automerger Merge Worker
ec01225c09 Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 
Change-Id: I38bc6d0694372eabce98c2c288e9b68d1a66928c
 2020-02-27 03:21:21 +00:00
Aaron Huang
bdb86ff8ab Merge "Add methods to send connected/disconnected state." 2020-02-27 03:21:14 +00:00
TreeHugger Robot
658fc6d6d6 Merge "A few inline autofill API tweaks." into rvc-dev 2020-02-27 03:16:38 +00:00
Peter Wang
2361687bec [API Review] Expose sendOrderedBroadcast 
with appOp as String and options as Bundle

Bug: 139077993
Bug: 146423958
Test: Build
Change-Id: I5325e08d60016741139251813a5df9b42f2efc82
Merged-In: I5325e08d60016741139251813a5df9b42f2efc82
 2020-02-26 15:58:33 -08:00
Automerger Merge Worker
f05237f452 Merge changes from topic "api-review-getNetworkDisableReasonString" into rvc-dev am: f16dce6f20 
Change-Id: I0151afda1e7e05dd7f228b8ffabd41a68cb5d231
 2020-02-26 23:44:43 +00:00
Automerger Merge Worker
76d81230e7 Merge "Wifi: Clean up APIs" into rvc-dev am: c4b4ccf575 
Change-Id: I8e8bea7e53eb856fb6c05a4510f4317e21cc1bb8
 2020-02-26 23:44:06 +00:00
David Su
f16dce6f20 Merge changes from topic "api-review-getNetworkDisableReasonString" into rvc-dev 
* changes:
  Settings: Rename NetworkSelectionStatus#getNetworkDisableReasonString
  Rename NetworkSelectionStatus#getNetworkDisableReasonString
 2020-02-26 23:42:53 +00:00
David Su
c4b4ccf575 Merge "Wifi: Clean up APIs" into rvc-dev 2020-02-26 23:42:35 +00:00
Automerger Merge Worker
ec9207c019 Merge "Hide setPolicyDataEnabled" into rvc-dev am: 710401a657 
Change-Id: Iea2c5cc50b124abe84d399493d7f32b04e36efda
 2020-02-26 23:42:22 +00:00
Amit Mahajan
e2cd048549 Change Context parameter to @NonNull. 
per API-council feedback.

Test: basic sanity; only an annotation change
Bug: 148380226
Merged-in: Ife6befc7be5cd488265135d6c77c0557c7545f38
Change-Id: Ife6befc7be5cd488265135d6c77c0557c7545f38
(cherry picked from commit 3d70a9a87a)
 2020-02-26 23:41:36 +00:00
TreeHugger Robot
710401a657 Merge "Hide setPolicyDataEnabled" into rvc-dev 2020-02-26 23:26:17 +00:00
Amit Mahajan
7411d22e57 Hide TelephonyRegistryManager. 
This was added for telephony mainline, and as such is not needed in
R now.

Test: basic sanity
Bug: 149850449
Change-Id: I2b47ab45839f07494dcad4f1878809a55ddd3087
 2020-02-26 23:04:04 +00:00