Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
460,864 Commits 3 Branches 0 Tags
12be21dc215e2e1feddd59f376ef72748047322c
Commit Graph

460864 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathew Inwood
12be21dc21 Fix some @link tags in @ChangeId docs. 
We now have javadoc based docs generated from these comments now. Ensure
the links can be resolved.

Bug: 144927670
Test: Test: m -j offline-sdk-docs
Change-Id: Ie9827ad02ad91ab7f01226a3a741c94fa46de730
 2020-01-17 11:29:23 +00:00
Martin Sundermeyer
8fda7a563c Merge "Add string constants for new Reminder intent." 2020-01-16 09:07:51 +00:00
Automerger Merge Worker
2a7b367d06 Merge "Replace CONNECTIVITY_INTERNAL in SystemUI" am: 3950a24dca am: 8d82c3cbd9 am: 8e92458626 
Change-Id: Id94e38dafad3dd6a5316c53ba357a8004a7d7b9e
 2020-01-16 07:58:53 +00:00
Automerger Merge Worker
8e92458626 Merge "Replace CONNECTIVITY_INTERNAL in SystemUI" am: 3950a24dca am: 8d82c3cbd9 
Change-Id: I0ef7475de6266ac7534e549a89a8418c8ea5bb3d
 2020-01-16 07:47:01 +00:00
Paul Hu
8d82c3cbd9 Merge "Replace CONNECTIVITY_INTERNAL in SystemUI" 
am: 3950a24dca

Change-Id: I576bb0f47831d6559c877176fc1beb24a0abfd2d
 2020-01-15 23:26:58 -08:00
Paul Hu
3950a24dca Merge "Replace CONNECTIVITY_INTERNAL in SystemUI" 2020-01-16 07:23:17 +00:00
Automerger Merge Worker
2647ea421b [automerger skipped] Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 57726b758e am: e87929a4b8 am: 8b9a742ff4 -s ours 
am skip reason: Change-Id I41edd697017f4ce59e6707302bebc0da3d75831d with SHA-1 798a92b2a6 is in history

Change-Id: I4a384a120904cbdb5080b2a93da69b8f793b8a97
 2020-01-16 07:22:18 +00:00
Automerger Merge Worker
8b9a742ff4 Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 57726b758e am: e87929a4b8 
Change-Id: Ifcfcfcceda89add886c2b99b5f4647d83d3967d9
 2020-01-16 07:12:06 +00:00
David Su
e87929a4b8 Merge "TetheringTests: Stop using @hide Wifi P2P APIs" 
am: 57726b758e

Change-Id: Ife0652af741a0bdb4d4eb9a8a10d0420963de9b3
 2020-01-15 23:01:59 -08:00
Automerger Merge Worker
15e32bf125 Merge "Support multiple DSU installations" am: 69d181aecc am: fd9ae75440 am: feb7f9cf81 
Change-Id: Iec8edb8568d707b827a8d4e70373333d96d6ab10
 2020-01-16 06:28:53 +00:00
Automerger Merge Worker
feb7f9cf81 Merge "Support multiple DSU installations" am: 69d181aecc am: fd9ae75440 
Change-Id: I236a00274d6b6e7d1c7ac134ef17232c368cdd6a
 2020-01-16 06:14:51 +00:00
Howard Chen
fd9ae75440 Merge "Support multiple DSU installations" 
am: 69d181aecc

Change-Id: I92e75dcf4bd28f3b9ad6fc876f155d772b3124a5
 2020-01-15 22:01:38 -08:00
TreeHugger Robot
4ec0be1faf Merge "Stop using UserHandle.getUserId() in media sever" 2020-01-16 05:51:58 +00:00
Treehugger Robot
57726b758e Merge "TetheringTests: Stop using @hide Wifi P2P APIs" 2020-01-16 05:51:49 +00:00
Howard Chen
69d181aecc Merge "Support multiple DSU installations" 2020-01-16 05:33:10 +00:00
TreeHugger Robot
b46aecc27e Merge "Add new permission to privapp-permissions" 2020-01-16 04:42:18 +00:00
Automerger Merge Worker
b69a2c9cd1 Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" am: ca98e2866e am: 2fd4a1c4be am: 4ce52911a3 
Change-Id: Id4452f8e0cf073cbf330bf1c4645a578df583997
 2020-01-16 03:31:27 +00:00
Automerger Merge Worker
e622d18de9 Merge "Add method to enforce READ_PRECISE_PHONE_STATE permission" am: 1be136dac6 am: a396fd5b22 am: b5f5377a51 
Change-Id: Ia70c6e9d94e212a1b0ea5d4d8a9ff63edbada1e5
 2020-01-16 03:30:36 +00:00
Automerger Merge Worker
c1a1b8c6ac Merge "Create a new API to decode Sms PDU" am: 7a837f162f am: 178b219963 am: 58cebe2cd7 
Change-Id: Ic87215615561c7435370cb1937b0031e76c9bae8
 2020-01-16 03:30:13 +00:00
Automerger Merge Worker
193ac71b1a Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" am: 6489e5328f am: e504547de4 am: d19804ce39 
Change-Id: Id7d190a4a8db19151c9face80cd61b1eb2408194
 2020-01-16 03:29:42 +00:00
Automerger Merge Worker
4ce52911a3 Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" am: ca98e2866e am: 2fd4a1c4be 
Change-Id: If51dce95c2779790a845c0462655e5f68cf1b1bf
 2020-01-16 03:20:42 +00:00
Calin Juravle
2fd4a1c4be Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" 
am: ca98e2866e

Change-Id: Ie0c5b0cb12f59c8bf5f2b9a0647cd6cecaacf352
 2020-01-15 19:18:29 -08:00
Automerger Merge Worker
b5f5377a51 Merge "Add method to enforce READ_PRECISE_PHONE_STATE permission" am: 1be136dac6 am: a396fd5b22 
Change-Id: I1355f6b269eebee486d5f51c9f3261ba01d8efb8
 2020-01-16 03:15:58 +00:00
Aaron Huang
9e0c5262ca Merge "Move DnsSdTxtRecord to net common static library" 2020-01-16 03:15:55 +00:00
Automerger Merge Worker
58cebe2cd7 Merge "Create a new API to decode Sms PDU" am: 7a837f162f am: 178b219963 
Change-Id: I2ea418a6542d2f4cfdac235a1d9c2476c5b297f3
 2020-01-16 03:15:45 +00:00
TreeHugger Robot
8e6358b19f Merge "Fixes provider authority matching when ';' is used." 2020-01-16 03:15:35 +00:00
Automerger Merge Worker
d19804ce39 Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" am: 6489e5328f am: e504547de4 
Change-Id: I1f86dc1ea1475741628b01dc3ee390f4d3018827
 2020-01-16 03:15:20 +00:00
Calin Juravle
ca98e2866e Merge "[DexManager] Fix off-by-N error in DexManager when reporting dex loads" 2020-01-16 03:14:05 +00:00
Dan Zimmerman
39b442cb61 [DexManager] Fix off-by-N error in DexManager when reporting dex loads 
In this loop the continue statement skips over incrementing
dexPathIndex. In effect the classloader context that reported for a
given dex file may be incorrect (specifically in the situation when the
user loads a primary dex file and a secondary dex file in the same
ClassLoader)

Bug: 147089377
Test: atest com.android.server.pm.dex.DexManagerTests
Change-Id: I7d3df507787f758537625b702131a2f4f76190e6
 2020-01-16 03:13:50 +00:00
Rambo Wang
a396fd5b22 Merge "Add method to enforce READ_PRECISE_PHONE_STATE permission" 
am: 1be136dac6

Change-Id: I766af9b2b0b439924a678886cd934a54a3c3194e
 2020-01-15 19:10:08 -08:00
Zongheng Wang
178b219963 Merge "Create a new API to decode Sms PDU" 
am: 7a837f162f

Change-Id: I1b2017ecd189c5a5f3da3bd1a45af514cd450ce7
 2020-01-15 19:06:03 -08:00
Rambo Wang
1be136dac6 Merge "Add method to enforce READ_PRECISE_PHONE_STATE permission" 2020-01-16 03:05:06 +00:00
Allen Su
e504547de4 Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" 
am: 6489e5328f

Change-Id: If2bf032caf0dab707f57059e8b19ed8da6a41a21
 2020-01-15 19:03:57 -08:00
Zongheng Wang
7a837f162f Merge "Create a new API to decode Sms PDU" 2020-01-16 02:54:40 +00:00
David Su
400a070fea Merge "Revert "framework.jar - include framework-wifi-stubs instead of framework-wifi"" 2020-01-16 02:52:50 +00:00
Allen Su
6489e5328f Merge "[RCS] Add triggerType for onNotifyUpdateCapabilites" 2020-01-16 02:45:40 +00:00
David Su
c865b21d4b Revert "framework.jar - include framework-wifi-stubs instead of framework-wifi" 
This reverts commit eb2572959a.

Reason for revert: Broke build

Change-Id: I694c84dec6ae47a6c86fa1036802cdd750490efc
 2020-01-16 02:43:21 +00:00
Sarah Chin
eee174f612 Merge "Re-expose raw data roaming state" 2020-01-16 02:38:46 +00:00
Automerger Merge Worker
e3f02b4ab0 [automerger skipped] Merge "Migrate convertHalCellIdentityToCellIdentity()" am: 3149662515 am: 5e93fbb847 am: 2b928f1c6a -s ours 
am skip reason: Change-Id Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9 with SHA-1 f55983a5d5 is in history

Change-Id: I6d689c08cc859318b4acf7118a024e406b78d6a5
 2020-01-16 02:38:05 +00:00
Automerger Merge Worker
2b928f1c6a Merge "Migrate convertHalCellIdentityToCellIdentity()" am: 3149662515 am: 5e93fbb847 
Change-Id: I262148c395993ca9ecca7ee80e971d9e1854356d
 2020-01-16 02:24:05 +00:00
TreeHugger Robot
35be8b1d52 Merge "Complete FrontendSettings" 2020-01-16 02:16:40 +00:00
Mingming Cai
5e93fbb847 Merge "Migrate convertHalCellIdentityToCellIdentity()" 
am: 3149662515

Change-Id: I282a6d05355037731c3851b20fc5b0a6a842df4b
 2020-01-15 18:14:18 -08:00
Daniel Bright
4694b12e00 Merge "Using PhoneTypes in TelephonyManager" 2020-01-16 02:11:56 +00:00
Mingming Cai
3149662515 Merge "Migrate convertHalCellIdentityToCellIdentity()" 2020-01-16 02:10:57 +00:00
Kweku Adams
5946fcb969 Merge "Update sticky battery saver off notification." 2020-01-16 02:01:07 +00:00
TreeHugger Robot
a98a0c6f46 Merge "Make the method for finding out if a device is org-owned public." 2020-01-16 01:58:08 +00:00
Automerger Merge Worker
acc4f31393 Merge "Remove phoneId from ImsUceManager" am: 8478802be5 am: 9995982748 am: 2cd8af1d78 
Change-Id: I8c0309448a8abb1a8094b4a82a11db812bfd3ff6
 2020-01-16 01:57:01 +00:00
TreeHugger Robot
cebccf30cb Merge "Change Doc for getConnectionInfo" 2020-01-16 01:52:04 +00:00
Automerger Merge Worker
2cd8af1d78 Merge "Remove phoneId from ImsUceManager" am: 8478802be5 am: 9995982748 
Change-Id: I4f11280d7130d9185615e2ba2116eb06de92fd27
 2020-01-16 01:44:39 +00:00
Brad Ebinger
9995982748 Merge "Remove phoneId from ImsUceManager" 
am: 8478802be5

Change-Id: Ia63840cb8c2c1d9792d929dc9248a4b21ff30c58
 2020-01-15 17:36:10 -08:00