Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
458,523 Commits 3 Branches 0 Tags
9bacfe13f4b2dd26afaaf67adcd0d7aa622ea4fa
Commit Graph

458523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Wang
9bacfe13f4 Merge "[Telephony Mainline] Expose getActiveSubscriptionIdList" 2020-01-07 04:15:30 +00:00
Automerger Merge Worker
fcca924d4e [automerger skipped] Merge "Add API signature files for the system server APIs" am: 159c9e52ef am: 89ed5dfc84 am: 0aec0db72f -s ours 
am skip reason: Change-Id Iec8cdd30ad5e4979d56140a8c00a85af6476f67f with SHA-1 13c923d00a is in history

Change-Id: Ia760a09625c30ef8bb3a7f4db458af06d9a6f73e
 2020-01-07 03:44:04 +00:00
Automerger Merge Worker
70dc4acecb Merge "Add minOccurs="0"" am: eebbbea8f0 am: 706ab14ac7 am: 6b2a8cf76a 
Change-Id: Icf498035d908a908e8e48661c3695de21d0e4062
 2020-01-07 03:43:22 +00:00
Automerger Merge Worker
9285198e1d Merge "Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT in tethering" am: 2bc689c178 am: cb3d93d558 am: 0105d9666f 
Change-Id: I5343382f412251aebd0c56670918a96bf871aff0
 2020-01-07 03:42:56 +00:00
Automerger Merge Worker
d6bf5aa253 Merge "Implement the ThreadPrioritySetter interface" am: bc0290a7b0 am: 4db03331ac am: 09b06a3f1f 
Change-Id: I54ee7272cd69f5e8e14777f8f717db8ce2239232
 2020-01-07 03:42:21 +00:00
Automerger Merge Worker
9f05b8921a [automerger skipped] Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b am: 646bdf8e89 -s ours 
am skip reason: Change-Id Ib142979858012bb766b4c107d41a21b0324de506 with SHA-1 9aa7b74a7a is in history

Change-Id: I06bea6151bff226fd4d7b52f1038f681b5b469a9
 2020-01-07 03:41:50 +00:00
JW Wang
80d95e1cf8 Merge "Add thread annotations (1/n)" 2020-01-07 03:41:17 +00:00
Automerger Merge Worker
8250be7908 Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d35c am: 8c349cff44 am: 3ea281feb8 
Change-Id: Iee06212929aef212ec1087235c736afb54336f0a
 2020-01-07 03:31:20 +00:00
Automerger Merge Worker
6c05251464 Merge "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." am: 928f0bf26e am: f680f6037d am: 2759f10a0e 
Change-Id: I02100d2ed5e1ad8361be8612733ec40a394b1ba1
 2020-01-07 03:30:52 +00:00
Automerger Merge Worker
50af36f05e [automerger skipped] Merge "Change get sub id list to get sub info list" am: 0c648888ea am: ad58c226ea am: 77daa9a283 -s ours 
am skip reason: Change-Id Id9860eb48cffbe6c5517e51d1c6ed29a84997bbd with SHA-1 d6552acf19 is in history

Change-Id: I9df187a9cba6ad61de6cd4485004699cea3352a6
 2020-01-07 03:29:47 +00:00
Automerger Merge Worker
0aec0db72f Merge "Add API signature files for the system server APIs" am: 159c9e52ef am: 89ed5dfc84 
Change-Id: I48d9dfd27f56f3a558b59180dbdd61b7fd0f27c7
 2020-01-07 03:27:07 +00:00
Automerger Merge Worker
6b2a8cf76a Merge "Add minOccurs="0"" am: eebbbea8f0 am: 706ab14ac7 
Change-Id: I362e334e0f3da2c3ff8502c05f33768f5004214a
 2020-01-07 03:26:30 +00:00
Jiyong Park
89ed5dfc84 Merge "Add API signature files for the system server APIs" 
am: 159c9e52ef

Change-Id: I1d51c83b15e2a3917a8036203760e4df206b990a
 2020-01-06 19:26:09 -08:00
Automerger Merge Worker
0105d9666f Merge "Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT in tethering" am: 2bc689c178 am: cb3d93d558 
Change-Id: I22067ead6a81c71fe32c9018462bd64f9119079d
 2020-01-07 03:26:05 +00:00
Automerger Merge Worker
09b06a3f1f Merge "Implement the ThreadPrioritySetter interface" am: bc0290a7b0 am: 4db03331ac 
Change-Id: Ib8df0e26ebc61f6d2014d8784e91c16197389fb1
 2020-01-07 03:25:43 +00:00
Automerger Merge Worker
646bdf8e89 Merge "Convert some users of Time.format() to an alt." am: 267b83e7d6 am: 1b0c2fcd3b 
Change-Id: I1cb9722000898c9d1a7d479e9b0d88f717c57414
 2020-01-07 03:25:07 +00:00
Sundong Ahn
706ab14ac7 Merge "Add minOccurs="0"" 
am: eebbbea8f0

Change-Id: I34356f5e15a8e72f535c07f3d1c2285d867ba2bc
 2020-01-06 19:23:05 -08:00
TreeHugger Robot
5fc0f56dab Merge ""write" methods for DVR recording" 2020-01-07 03:19:15 +00:00
markchien
cb3d93d558 Merge "Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT in tethering" 
am: 2bc689c178

Change-Id: I8112bdc70126bd3598ad71703911c63f45cec945
 2020-01-06 19:18:56 -08:00
Automerger Merge Worker
3ea281feb8 Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" am: 03cbd5d35c am: 8c349cff44 
Change-Id: I02a786fbf6ea2b9378ba62159034ba42efb01e56
 2020-01-07 03:18:44 +00:00
Automerger Merge Worker
2759f10a0e Merge "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." am: 928f0bf26e am: f680f6037d 
Change-Id: I240cfc417e55d19ee2443765d66721adc81cfc70
 2020-01-07 03:18:11 +00:00
Automerger Merge Worker
77daa9a283 Merge "Change get sub id list to get sub info list" am: 0c648888ea am: ad58c226ea 
Change-Id: I2852fdffd8896f6eb0c890e0d7da987f047fa71d
 2020-01-07 03:17:12 +00:00
Treehugger Robot
159c9e52ef Merge "Add API signature files for the system server APIs" 2020-01-07 03:15:03 +00:00
Treehugger Robot
eebbbea8f0 Merge "Add minOccurs="0"" 2020-01-07 03:13:04 +00:00
Rick Yiu
4db03331ac Merge "Implement the ThreadPrioritySetter interface" 
am: bc0290a7b0

Change-Id: I333361efe7fa5dff72808394617d39270458d80b
 2020-01-06 19:12:32 -08:00
Allen Su
1b0c2fcd3b Merge "Convert some users of Time.format() to an alt." 
am: 267b83e7d6

Change-Id: Ide4b3813fe9666259f4e94462f89c1683d2ba6ed
 2020-01-06 19:09:57 -08:00
Tom Hsu
8c349cff44 Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" 
am: 03cbd5d35c

Change-Id: I9f53f6764011e58deaa43d929f92f720368847a2
 2020-01-06 19:09:05 -08:00
easoncylee
f680f6037d Merge "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." 
am: 928f0bf26e

Change-Id: I2b0193723f0c05f82aee1352fda60495cdaf517e
 2020-01-06 19:08:29 -08:00
Daniel Bright
ad58c226ea Merge "Change get sub id list to get sub info list" 
am: 0c648888ea

Change-Id: I5763ad79bfd1c509da5ada49c099483c7906d1e0
 2020-01-06 19:05:12 -08:00
Betty Chang
02141e80f7 Merge "[Mainline] Move the setAlwaysAllowMmsData from SubscriptionManager to TelephonyManager" 2020-01-07 02:41:52 +00:00
Treehugger Robot
2bc689c178 Merge "Remove FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT in tethering" 2020-01-07 02:31:41 +00:00
Rick Yiu
bc0290a7b0 Merge "Implement the ThreadPrioritySetter interface" 2020-01-07 02:31:17 +00:00
Allen Su
267b83e7d6 Merge "Convert some users of Time.format() to an alt." 2020-01-07 02:28:15 +00:00
Tom Hsu
03cbd5d35c Merge "Change TelephonyManager#isManualNetworkSelectionAllowed to system api" 2020-01-07 02:24:31 +00:00
Steven Moreland
5b333c3de4 Merge "vibrator: use package as name" 2020-01-07 02:19:06 +00:00
Treehugger Robot
928f0bf26e Merge "Convert apct/framework/window_manager_presubmit-cloud-tf to Test Mapping Suite." 2020-01-07 02:18:22 +00:00
Jeffrey Huang
89e95d5b5f Merge changes I1510e44b,I9313299e,I7df5c644 
* changes:
  Update setBroadcastSubscriber
  Update activeConfigsChangedBroadcast
  Creating PendingIntentRef
 2020-01-07 02:18:22 +00:00
Treehugger Robot
0c648888ea Merge "Change get sub id list to get sub info list" 2020-01-07 02:14:00 +00:00
TreeHugger Robot
72874be4c7 Merge "Make SignalStrength constructor system APIs" 2020-01-07 02:10:35 +00:00
TreeHugger Robot
bd1fd0df5c Merge "Remove debug logs" 2020-01-07 02:06:39 +00:00
TreeHugger Robot
ae70e4d9d3 Merge "Parse empty component permissions as null" 2020-01-07 02:06:09 +00:00
TreeHugger Robot
5a99ba031e Merge "Wifi: validate the wep key specified by the key index" 2020-01-07 02:02:19 +00:00
Automerger Merge Worker
924220ae8b [automerger skipped] Merge "SMS service loads MMS config directly instead" am: 250a41a139 am: e93312767b am: af1eb246ef -s ours 
am skip reason: Change-Id Idc21015cab2902bd0f67e2131ea89b04c4fc4f5e with SHA-1 44fb1904e3 is in history

Change-Id: I16d1d8f8306bca1d74baebceb695008247fbfc91
 2020-01-07 02:01:17 +00:00
Automerger Merge Worker
af1eb246ef Merge "SMS service loads MMS config directly instead" am: 250a41a139 am: e93312767b 
Change-Id: I654b7a4b46f7f0795c0e39d364392e247edb174f
 2020-01-07 01:50:47 +00:00
TreeHugger Robot
2a4b15a30f Merge "Split filter event classes to make them top-level" 2020-01-07 01:45:30 +00:00
shubang
5f4ea35eb3 "write" methods for DVR recording 
Test: make;
Change-Id: I00827ba33477f78985de05fed6e771e500c68c29
 2020-01-06 17:41:02 -08:00
Taesu Lee
e93312767b Merge "SMS service loads MMS config directly instead" 
am: 250a41a139

Change-Id: If563ce6935b844a9747c6544c67f1988d64e0e4e
 2020-01-06 17:34:39 -08:00
Automerger Merge Worker
48c8548945 Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e am: 3cfdaf97d4 
Change-Id: If794d46074f6e09e65717a90a4b4084d4b26cc12
 2020-01-07 01:32:54 +00:00
Treehugger Robot
250a41a139 Merge "SMS service loads MMS config directly instead" 2020-01-07 01:29:05 +00:00
Automerger Merge Worker
3cfdaf97d4 Merge "Expose SignalStrength.CREATOR" am: b0546af594 am: 9ca0d16b2e 
Change-Id: Ie785dcbdbe287ad6c4c7ecf94a2bb412bbce1408
 2020-01-07 01:20:38 +00:00