Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
441,500 Commits 3 Branches 0 Tags
a19cc690fb6ba0d54f4eaaf2a5f89a4af8015fe7
Commit Graph

441500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
a19cc690fb Merge changes from topic "fix-package-manager-usages" am: 7ecda7500f am: 305f883475 
Change-Id: I6bb485bdf2f48fc382cae75e6eb94cd0bd6e0f27
 2020-01-08 01:15:17 +00:00
Automerger Merge Worker
b43f5315ca Merge "Fix some @hide usage in Tethering" am: b763432e14 am: aff6974b16 
Change-Id: Ie88cd6ef541d5bd9fcec2e26c03277c75919a1a0
 2020-01-08 01:13:35 +00:00
Hall Liu
305f883475 Merge changes from topic "fix-package-manager-usages" 
am: 7ecda7500f

Change-Id: I3d3de1578520ce9dc0a5380a1d0f1b8fb343d2f7
 2020-01-07 17:08:48 -08:00
Mark Chien
aff6974b16 Merge "Fix some @hide usage in Tethering" 
am: b763432e14

Change-Id: Ia2bb316735b3d57c501bcf76afa328137caf4bcd
 2020-01-07 17:03:49 -08:00
Treehugger Robot
7ecda7500f Merge changes from topic "fix-package-manager-usages" 
* changes:
  Fix usages of PackageManager APIs in Telephony
  Fix hidden API usage in PackageChangeReceiver
 2020-01-08 01:00:22 +00:00
Mark Chien
b763432e14 Merge "Fix some @hide usage in Tethering" 2020-01-08 00:37:43 +00:00
Automerger Merge Worker
76131d7715 Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" am: 6a2dab6878 am: 545283a8d2 
Change-Id: I838e73a328a4965b4a0b2217d57274feb97961d9
 2020-01-08 00:18:06 +00:00
Shuo Qian
545283a8d2 Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" 
am: 6a2dab6878

Change-Id: Id53db8ba6de678710e75c3435ff8ef312731410e
 2020-01-07 16:04:00 -08:00
Shuo Qian
6a2dab6878 Merge "Expose getActiveSubscriptionInfoForIcc for Mainline" 2020-01-07 23:48:56 +00:00
Automerger Merge Worker
0d5314922c Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" am: 18077c1587 am: 85ba19fa5f 
Change-Id: Ia47ac5e4128943dbf369b4f8c5e21aa503f6b67d
 2020-01-07 23:09:43 +00:00
Automerger Merge Worker
720a58f07c Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" am: 599866e91f am: 36aa46b9f8 
Change-Id: I211d1e8d41c4cf9068a349240939cd262355c027
 2020-01-07 23:09:01 +00:00
Peter Wang
85ba19fa5f Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" 
am: 18077c1587

Change-Id: I675fe6a6056e0d57c61745b3a21c0998d8eab3c7
 2020-01-07 15:08:23 -08:00
Automerger Merge Worker
ea5f0b585a Merge "vibrator: use package as name" am: 663e1700be am: 957216f3d5 
Change-Id: I5c222505f97ed2795a81e5e6e9b9b2b8ed4b6687
 2020-01-07 23:07:40 +00:00
Automerger Merge Worker
01c6d1f405 Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 am: 8bc1955d0e am: 45dbf8cc5a 
Change-Id: I42352aedf0b91b840078ada4566927c9878544fd
 2020-01-07 23:07:01 +00:00
Peter Wang
18077c1587 Merge "[Telephony Mainline] Move CarrierAppUtils and LocationAccessPolicy to telephony common" 2020-01-07 22:59:17 +00:00
Daniel Bright
36aa46b9f8 Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" 
am: 599866e91f

Change-Id: Iaa4d6c16a0f8a68bf0736be95b514ff6f702da26
 2020-01-07 14:58:30 -08:00
Automerger Merge Worker
45dbf8cc5a Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 am: 8bc1955d0e 
Change-Id: Ie77e185c38a1a5eda8efa73577d98babadb6e90d
 2020-01-07 22:54:47 +00:00
Steven Moreland
957216f3d5 Merge "vibrator: use package as name" 
am: 663e1700be

Change-Id: I3dcc58a4f92221089d6c67a860bc08bd40890b00
 2020-01-07 14:48:44 -08:00
Daniel Bright
599866e91f Merge "Commented out NETWORK_TYPE_LTE_CA in logging function" 2020-01-07 22:47:39 +00:00
Steven Moreland
663e1700be Merge "vibrator: use package as name" 2020-01-07 22:43:01 +00:00
Automerger Merge Worker
8bc1955d0e Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 
Change-Id: I306e8e186d2350f2dabb7238ad8b5c55d8e04e1d
 2020-01-07 22:41:40 +00:00
Kevin Hufnagle
732a127636 Merge "docs: Add documentation for equals() method" into qt-dev 2020-01-07 22:29:32 +00:00
sqian
ff8dfe7eb2 Expose getActiveSubscriptionInfoForIcc for Mainline 
Test: cts; treehugger
Bug: 122015219
Change-Id: I900e36fafe009206ec7431220603fcb8f404e33e
Merged-In: I900e36fafe009206ec7431220603fcb8f404e33e
(cherry picked from commit b086534dbe)
 2020-01-07 13:45:07 -08:00
Automerger Merge Worker
c170b84497 Merge "Add setConnectionPolicy to BluetoothPbap" am: c0c8c00976 am: 53c8e6cbc0 
Change-Id: I0bb2aae1c2809a4da648263a1e1df0f1bc2cfafc
 2020-01-07 21:13:34 +00:00
Automerger Merge Worker
a4ea319b72 Merge "Both build 32 and 64 architecture for TetheringTests" am: 736ed507d6 am: 6aca95071a 
Change-Id: I7df9227c4a563cd476419149f148e282ac29305a
 2020-01-07 21:12:51 +00:00
Rahul Sabnis
53c8e6cbc0 Merge "Add setConnectionPolicy to BluetoothPbap" 
am: c0c8c00976

Change-Id: I96a64f6a86392f1140884fc03f8059b5590e8736
 2020-01-07 12:56:19 -08:00
markchien
6aca95071a Merge "Both build 32 and 64 architecture for TetheringTests" 
am: 736ed507d6

Change-Id: Ifdad078ceab7a948629e5d6d8c4cca15da796359
 2020-01-07 12:42:47 -08:00
Treehugger Robot
c0c8c00976 Merge "Add setConnectionPolicy to BluetoothPbap" 2020-01-07 20:33:21 +00:00
Automerger Merge Worker
626ceae57e Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48 
Change-Id: Ic6046fc883372c42fd95886b143c1661b027cf6e
 2020-01-07 20:31:13 +00:00
Automerger Merge Worker
e1d4aa1ab4 Merge "Add isEmergencyApn" am: 660a94aea9 am: 01493ff22b 
Change-Id: I5fa0fa0b21db4c9796a0f0a3e15526eca285c7f8
 2020-01-07 20:30:19 +00:00
Treehugger Robot
736ed507d6 Merge "Both build 32 and 64 architecture for TetheringTests" 2020-01-07 20:30:15 +00:00
Automerger Merge Worker
7fa8a170b7 Merge "Revert submission 1182953-1576003954286-8455af5a" am: 06675f9106 am: 78f50dfb15 
Change-Id: I6380e885b458fa3656c413efb12cc3725bd33eaa
 2020-01-07 20:29:38 +00:00
Meng Wang
2d9062cc48 Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 
am: d8836ba33f

Change-Id: Ibc5582f7e6ad9628baf0b2047a84048a86f001b3
 2020-01-07 12:14:16 -08:00
Jordan Liu
01493ff22b Merge "Add isEmergencyApn" 
am: 660a94aea9

Change-Id: I2cc69815894a426423396efb512986581b25c3e3
 2020-01-07 12:10:35 -08:00
Chen Xu
78f50dfb15 Merge "Revert submission 1182953-1576003954286-8455af5a" 
am: 06675f9106

Change-Id: Ib13d9717878f79649f68cb609e9ac42f575df062
 2020-01-07 12:07:06 -08:00
Meng Wang
d8836ba33f Merge "Remove unused broadcast DATA_CONNECTION_FAILED" 2020-01-07 19:59:36 +00:00
Jordan Liu
660a94aea9 Merge "Add isEmergencyApn" 2020-01-07 19:29:39 +00:00
Chen Xu
06675f9106 Merge "Revert submission 1182953-1576003954286-8455af5a" 2020-01-07 19:29:08 +00:00
Hall Liu
e7baa9e91e Fix usages of PackageManager APIs in Telephony 
Remove usages of the hidden PackageManager#*asUser methods from
Telephony, and add some unit tests to verify the functionality.

Test: atest FrameworksTelephonyTests
Test: atest TelephonyCommonTests
Bug: 146834818
Change-Id: I2e2ec2c421773e3ff58556373896238e1ff0678a
Merged-In: I2e2ec2c421773e3ff58556373896238e1ff0678a
 2020-01-07 11:01:55 -08:00
Hall Liu
437010229d Fix hidden API usage in PackageChangeReceiver 
Use Context#createContextForUser instead of calling
Context#registerReceiverForUser.

Test: atest FrameworksTelephonyTests
Bug: 146834818
Change-Id: Ia239499219218d30d1556007ac4561a5ec44b72f
Merged-In: Ia239499219218d30d1556007ac4561a5ec44b72f
 2020-01-07 11:01:49 -08:00
Automerger Merge Worker
3ac69fd2b8 Merge "Do not use hidden HandlerExecutor" am: 166c8761a4 am: 2072de8ff8 
Change-Id: Ic4710704a12bd0bc061d26390199355ed926557c
 2020-01-07 18:55:38 +00:00
James Lin
2072de8ff8 Merge "Do not use hidden HandlerExecutor" 
am: 166c8761a4

Change-Id: I6a82684f3d12e01fb8aa7501a229348fc33ef4ea
 2020-01-07 10:41:50 -08:00
James Lin
166c8761a4 Merge "Do not use hidden HandlerExecutor" 2020-01-07 18:35:07 +00:00
Kevin Hufnagle
1757a96d7c docs: Add documentation for equals() method 
Explain the conditions that must be true in order for two objects
of type `ComponentName` to be considered equal.

Test: make ds-docs -j32

Bug: 62991861

Change-Id: I162ecd825b187ca688af11271a937e3740a4a833
Exempt-From-Owner-Approval: Docs-only change
 2020-01-07 18:30:50 +00:00
Automerger Merge Worker
39d6ba888d Merge "Fix annotation / debugging" am: 69bbb1904f am: 1d866c0bf3 
Change-Id: I01e7c1b39e2c1df26f9b64c441136ccfbedcc77f
 2020-01-07 16:40:04 +00:00
Neil Fuller
1d866c0bf3 Merge "Fix annotation / debugging" 
am: 69bbb1904f

Change-Id: I9da174d658ada4acf399fe9f743b012aea7ebeae
 2020-01-07 08:29:19 -08:00
Neil Fuller
69bbb1904f Merge "Fix annotation / debugging" 2020-01-07 16:24:38 +00:00
Neil Fuller
4d10019960 Fix annotation / debugging 
Fix copy and paste errors from commit 4ab8a199de -
the API is new so does not need @UnsupportedAppUsage and
the debug log was incorrect.

Bug: 140712361
Test: build only
Change-Id: I123f76d011d7505d3dc053cb48c40353f0579d17
 2020-01-07 14:32:29 +00:00
Automerger Merge Worker
4de1014d6c Merge "android.net.http: Update OWNERS." am: 106d798af8 am: 55024898c8 
Change-Id: I3491c6ab0f7591ce3acfe89da8ec976d831da364
 2020-01-07 14:02:56 +00:00
Tobias Thierer
55024898c8 Merge "android.net.http: Update OWNERS." 
am: 106d798af8

Change-Id: I4f135178ae22b85d0c9196ac70ba6bc6b2793d80
 2020-01-07 05:50:18 -08:00