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

29649 Commits

Author SHA1 Message Date
Automerger Merge Worker
6edffef90b Merge changes I7ac3a378,Id06a24d2 into rvc-dev am: e4beb133e6 am: c9c1c21223 am: f05b62c3a8 am: e971986dae 
Change-Id: I5b09d0ad8373b820785eecfe1ebb7f0ca10b2dc6
 2020-02-28 20:08:42 +00:00
Automerger Merge Worker
e971986dae Merge changes I7ac3a378,Id06a24d2 into rvc-dev am: e4beb133e6 am: c9c1c21223 am: f05b62c3a8 
Change-Id: I479ab9976e282e0f8358b89b4ef989835d3dcd11
 2020-02-28 19:55:27 +00:00
Automerger Merge Worker
cc43bb04f6 Merge "[API Review] Expose sendOrderedBroadcast" into rvc-dev am: 879f32b1cc am: 0448706989 am: 9e07b0ebe6 
Change-Id: Ifc7d5909cf2ab76e9595ce559a77a96b5b0b693b
 2020-02-28 19:55:10 +00:00
Bonian Chen
500ecbcfa1 Merge "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API" 2020-02-28 19:07:28 +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
Automerger Merge Worker
2eb7b59d8d Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177 am: c465a33021 am: 03f2c56edd am: 8590e88fb1 
Change-Id: I1bbfcc343194a7763269221bc1989d157f381c3f
 2020-02-28 12:21:56 +00:00
Automerger Merge Worker
03f2c56edd Merge "Make MediaRouter2 callback classes as abstract" into rvc-dev am: fde0af9177 am: c465a33021 
Change-Id: I2b88b8e490ed6aa17780e64ab4cc4e252344eb22
 2020-02-28 11:47:08 +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
TreeHugger Robot
003af80cc5 Merge "Add comments to messageId, subMessageId and data" 2020-02-28 04:09:18 +00:00
Automerger Merge Worker
72702b9796 Merge "Fix crash and duplicated ethernet tethering request" am: 41c82c99df am: d74f557cbf am: 0b64d65f28 am: 3b00df439f am: f5c05ee4df 
Change-Id: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
 2020-02-28 03:42:44 +00: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
Jing Ji
453030c56c Merge "Update the categories of app kill reaons" 2020-02-27 23:20:37 +00:00
Joshua Imbriani
001afb144c Merge "Adding new overloads for addEarcon and addSpeech that takes Uri" 2020-02-27 22:39:01 +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
Automerger Merge Worker
44d00f5000 Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 am: 35e0d1892e am: c6167205e3 
Change-Id: Ia7093396b057e4153f051f3e5fe0c60d2d9f2a54
 2020-02-27 19:15:40 +00:00
Amit Mahajan
ba07b06d19 Merge "Change Context parameter to @NonNull." 2020-02-27 19:02:14 +00:00
Automerger Merge Worker
35e0d1892e Merge "Hide TelephonyRegistryManager." into rvc-dev am: cc7682bd15 am: 5363f5e711 
Change-Id: Ibfa763b4804e034bd8b43722d0467b23ce44a55b
 2020-02-27 18:41:25 +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
Josh Imbriani
7b42c6ea1b Adding new overloads for addEarcon and addSpeech that takes Uri 
Bug: 139179420
Bug: 139180464
Test: Ran CTS test
Test: "run cts -m CtsSpeechTestCases"

Change-Id: Ie4cbd8aa91805804e099027b2404162e651323ca
 2020-02-27 09:26:45 -08:00
Bonian Chen
72f1472aac [Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API 
Remove CarrierConfigManager.Apn.KEY_PREFIX from public API since it is
not required.

Bug: 150126716
Test: build pass
Change-Id: Ib9b2c3701629b826842e9d2c92ec82b3a85bc67e
 2020-02-27 22:58:32 +08:00
Automerger Merge Worker
d7368f2757 Merge "Remove the public APIs for allow rich content." into rvc-dev am: 2ebe60b5df am: 32f03587a1 
Change-Id: I319716ee39433e5d7223a286281dd046833c4263
 2020-02-27 10:55:21 +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
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
Automerger Merge Worker
64fd8458ef Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev am: 8e5e4e03a9 am: a44be1c266 am: 0a210abe2f am: 4139b78b32 
Change-Id: I1241b9fc76ce3440db1c76ca688b0c5fec829675
 2020-02-27 05:39:07 +00:00
Automerger Merge Worker
0a210abe2f Merge "Hide CarrierMessagingServiceWrapper for now." into rvc-dev am: 8e5e4e03a9 am: a44be1c266 
Change-Id: I34e53f01e7f7c38e9bb14477ec24ebc986120d52
 2020-02-27 04:53:56 +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
9414bb1cae Merge "A few inline autofill API tweaks." into rvc-dev am: 658fc6d6d6 am: ec01225c09 am: d1e01aa93e am: a709dc0c0e 
Change-Id: I3afde2c93099b3b2e28d8195db166494fddcb0de
 2020-02-27 03:50:29 +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
Automerger Merge Worker
6824345c91 Rename NetworkSelectionStatus#getNetworkDisableReasonString am: e4956075da am: 279ce021c3 am: 0c2510643f am: 9d21c2d0a9 
Change-Id: Ib1ef52801d0c528d4446730d95cbac36c92c29d5
 2020-02-27 00:26:23 +00:00
Automerger Merge Worker
46ac5590cb Merge "Wifi: Clean up APIs" into rvc-dev am: c4b4ccf575 am: 5f66281d2a am: 984b6b6f9e am: 8526864b73 
Change-Id: I29d9dab451f91b1e0f40b31b00db2b041f1bfcf4
 2020-02-27 00:24:43 +00:00
Automerger Merge Worker
93b13ed240 Merge "Hide setPolicyDataEnabled" into rvc-dev am: 710401a657 am: 859b937f5e am: 9a0cae2d59 am: 6761af4145 
Change-Id: I43885a73760cd6a2f3ce8862c0dc317969b40438
 2020-02-27 00:24:25 +00:00
Automerger Merge Worker
9d21c2d0a9 Rename NetworkSelectionStatus#getNetworkDisableReasonString am: e4956075da am: 279ce021c3 am: 0c2510643f 
Change-Id: I201e79656ba1e9cb0f40fdeb683decb12c88f4da
 2020-02-27 00:15:27 +00:00
Automerger Merge Worker
8526864b73 Merge "Wifi: Clean up APIs" into rvc-dev am: c4b4ccf575 am: 5f66281d2a am: 984b6b6f9e 
Change-Id: Ic6647cc889299c3e95656eca3c7e0ffece4e89f4
 2020-02-27 00:15:07 +00:00
Automerger Merge Worker
6761af4145 Merge "Hide setPolicyDataEnabled" into rvc-dev am: 710401a657 am: 859b937f5e am: 9a0cae2d59 
Change-Id: Ie307b209fd0bfc064670b1e7fa5459053b9b8497
 2020-02-27 00:13:21 +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
279ce021c3 Rename NetworkSelectionStatus#getNetworkDisableReasonString am: e4956075da 
Change-Id: I31f1b91b429665065e1ce78d99f28269caa9b754
 2020-02-26 23:45:46 +00: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