Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
453,221 Commits 3 Branches 0 Tags
9707dc2136f659de3288917e9ae3b920bdb45013
Commit Graph

453221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate(Qiang) Jiang
9707dc2136 [NetworkSuggestion] change comments to fit the disconnect behavior 
Bug: 137582811
Test: build
Change-Id: I0ee13a98c74e25cac9b94ee16703e291a2ff2610
 2019-11-26 10:55:12 -08:00
Jayachandran Chinnakkannu
13d940da4d Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" am: 2f1c32ef23 am: 3fdb0fbc87 
am: 2fc6385366

Change-Id: Ifb8410dbb81cdc55c109ef8d7b190e1d9f6bf852
 2019-11-25 16:09:16 -08:00
Jayachandran Chinnakkannu
2fc6385366 Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" am: 2f1c32ef23 
am: 3fdb0fbc87

Change-Id: I3dc4572e3b3d2c80a446d78fb0785f8f63bf2391
 2019-11-25 16:03:45 -08:00
Jayachandran Chinnakkannu
3fdb0fbc87 Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" 
am: 2f1c32ef23

Change-Id: I1d34b1d5cb8f6b1f25269ee0238d6f4dba33ac50
 2019-11-25 15:56:54 -08:00
Jayachandran Chinnakkannu
2f1c32ef23 Merge "Remove usage of hidden API TelephonyManager.getLine1Number(int)" 2019-11-25 23:42:38 +00:00
Nate Jiang
91b408266d Merge "User binder as identifier for scanResultcallback" 2019-11-25 23:38:41 +00:00
Xiangyu/Malcolm Chen
53994ad2e6 [automerger skipped] Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." am: 0f2c3d963d am: 19c52ea987 -s ours 
am: c3bd70255e -s ours
am skip reason: change_id I67a0121d3e965f193be9e827533646423502fe70 with SHA1 4bff428285 is in history

Change-Id: Iddcaf3682e94f97d3de7125498aad1c7efc042b3
 2019-11-25 15:15:14 -08:00
Xiangyu/Malcolm Chen
37247c85a2 [automerger skipped] Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" am: de5e074ee7 am: 9e63a140d4 
am: 3dd27a29a6 -s ours
am skip reason: change_id Iec56cc99f9e702ebdbbdd78ad5362de0ff4e3ff2 with SHA1 5d3546104e is in history

Change-Id: I9d99d5ec5cd2c70598168e41f2cb1da2c5f20500
 2019-11-25 15:09:41 -08:00
Xiangyu/Malcolm Chen
c3bd70255e [automerger skipped] Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." am: 0f2c3d963d 
am: 19c52ea987 -s ours
am skip reason: change_id I67a0121d3e965f193be9e827533646423502fe70 with SHA1 4bff428285 is in history

Change-Id: Ib88627e49f20bb6809eeeafc5e1f67cbc81c794c
 2019-11-25 15:08:33 -08:00
Meng Wang
8adec1b5d9 Merge "Expose API isInEmergencySmsMode" 2019-11-25 23:06:23 +00:00
Xiangyu/Malcolm Chen
ef3679edf9 [automerger skipped] Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException" am: e14caf398e am: 62351088ee -s ours 
am: 57fc9c1171 -s ours
am skip reason: change_id I57b87755f6ddf962721e620f869ff48370e3f2d6 with SHA1 ebc4cff912 is in history

Change-Id: I236e0fd2b8dfe8b4f3ac14e9947d8b1b62873df7
 2019-11-25 15:04:07 -08:00
Xiangyu/Malcolm Chen
3dd27a29a6 Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" am: de5e074ee7 
am: 9e63a140d4

Change-Id: Iecf3c832b37c3a12e85f23ef2e6536f338c122ab
 2019-11-25 15:03:47 -08:00
Jiashen Wang
829ca16f1b Merge "Change KEY_CARRIER_APP_REQUIRED_DURING_SIM_SETUP_BOOL to public" 2019-11-25 23:01:13 +00:00
Xiangyu/Malcolm Chen
19c52ea987 Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." 
am: 0f2c3d963d

Change-Id: I70fe3e46ce42dcb8ad7a344906735d1d55421fc7
 2019-11-25 15:00:04 -08:00
Xiangyu/Malcolm Chen
57fc9c1171 [automerger skipped] Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException" am: e14caf398e 
am: 62351088ee -s ours
am skip reason: change_id I57b87755f6ddf962721e620f869ff48370e3f2d6 with SHA1 ebc4cff912 is in history

Change-Id: Ifa2a8ec40b39a035a9df74f8199f6d6beda431ab
 2019-11-25 14:58:34 -08:00
Xiangyu/Malcolm Chen
9e63a140d4 Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" 
am: de5e074ee7

Change-Id: I235ada1332a154ca900ee778eed9562286cf7118
 2019-11-25 14:55:14 -08:00
Xiangyu/Malcolm Chen
62351088ee Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException" 
am: e14caf398e

Change-Id: I2d5160d893eb8c47556ba5101503bf3a7aafa195
 2019-11-25 14:51:53 -08:00
Xiangyu/Malcolm Chen
0f2c3d963d Merge "Don't allow reading IMSI of one active sub if only has carrier privilege on the other." 2019-11-25 22:44:35 +00:00
Xiangyu/Malcolm Chen
de5e074ee7 Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" 2019-11-25 22:44:12 +00:00
Xiangyu/Malcolm Chen
e14caf398e Merge "Add comment in getSubscriptionsInGroup about throwing IllegalStateException" 2019-11-25 22:43:40 +00:00
Jayachandran C
43022eb20a Remove usage of hidden API TelephonyManager.getLine1Number(int) 
This CL creats subscription specific telephony manager instance
and then invokes getLine1Number() API.

Bug: 140908357
Test: Build
Change-Id: Ib49098dcf3a0718d498d829765ba7f52d9a1de09
 2019-11-25 14:32:24 -08:00
Meng Wang
b03e9a1171 Merge "Move SmsConstants to telephony/common" am: e34b67f5ca am: f0c0d50f49 
am: 77cc8e5cf2

Change-Id: I6c894ef89a641df05a04bd3ad0304ed97477a4f7
 2019-11-25 14:24:11 -08:00
John Reck
8543cb56c2 [automerger skipped] Merge "Fix for Surface#lockHardwareCanvas lockups" into qt-qpr1-dev am: d90c8a0f5e 
am: 122674a0b5 -s ours
am skip reason: change_id Iffbd9f9e6689a40876ff3aa74c10020e3f09fc6a with SHA1 cd18c2271d is in history

Change-Id: I223c27bdcb652522b36f0d4dc55657514bfe627d
 2019-11-25 14:18:23 -08:00
Meng Wang
77cc8e5cf2 Merge "Move SmsConstants to telephony/common" am: e34b67f5ca 
am: f0c0d50f49

Change-Id: I52ff07ca5b69c22e86de72465b031d45da165490
 2019-11-25 14:18:19 -08:00
Meng Wang
f0c0d50f49 Merge "Move SmsConstants to telephony/common" 
am: e34b67f5ca

Change-Id: I35f2a22224bd1998a60a1ff080b3bfce8a3a9bdd
 2019-11-25 14:13:33 -08:00
John Reck
122674a0b5 Merge "Fix for Surface#lockHardwareCanvas lockups" into qt-qpr1-dev 
am: d90c8a0f5e

Change-Id: I918abc5c9160c4f0f50b5679b6f8835105c25d84
 2019-11-25 14:12:53 -08:00
John Reck
d90c8a0f5e Merge "Fix for Surface#lockHardwareCanvas lockups" into qt-qpr1-dev 2019-11-25 22:05:33 +00:00
Jayachandran Chinnakkannu
5a00ad3a75 Merge "SmsNumberUtils: Remove usage of the following hidden APIs" am: 6052ca74cd am: e294de2414 
am: 2380f6153e

Change-Id: I720c0a8ec995210cf53fa3c9e3c20bf9aa96bc23
 2019-11-25 14:03:50 -08:00
Meng Wang
e34b67f5ca Merge "Move SmsConstants to telephony/common" 2019-11-25 21:59:10 +00:00
Jayachandran Chinnakkannu
2380f6153e Merge "SmsNumberUtils: Remove usage of the following hidden APIs" am: 6052ca74cd 
am: e294de2414

Change-Id: I3aec587d274271c5521fd47ab8a5f9c9ad1094fc
 2019-11-25 13:54:37 -08:00
Mathieu Chartier
3468085a5c [automerger skipped] Merge "Pass runtimeFlags to postForkSystemServer" am: d9bcf56448 am: b541162122 
am: 7770a00eb8 -s ours
am skip reason: change_id I9416ef888557bf0bc0ec7c83f7af1979cac351f8 with SHA1 2cb0a4d860 is in history

Change-Id: Id264d21b348f8d6dff94fe9dd925099b11388e6b
 2019-11-25 13:52:04 -08:00
Jayachandran Chinnakkannu
e294de2414 Merge "SmsNumberUtils: Remove usage of the following hidden APIs" 
am: 6052ca74cd

Change-Id: Ib0ed8f4cff78b5caca69ee01cf00e6a03026a456
 2019-11-25 13:48:46 -08:00
Android Build Merger (Role)
4ac18603d0 Merge "[automerger skipped] Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321 am: a575fdfc31 am: eb7ac68dff -s ours am skip reason: change_id Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd with SHA1 b908f9c5f9 is in history" 2019-11-25 21:46:36 +00:00
Malcolm Chen
d053453b1f [automerger skipped] Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321 am: a575fdfc31 
am: eb7ac68dff -s ours
am skip reason: change_id Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd with SHA1 b908f9c5f9 is in history

Change-Id: I1a9df917aa7cb9afbac4c2b399a4c7e4f25037c8
 2019-11-25 13:46:07 -08:00
Mathieu Chartier
7770a00eb8 Merge "Pass runtimeFlags to postForkSystemServer" am: d9bcf56448 
am: b541162122

Change-Id: Ia5a036407ecac6e2b178f67b199214d93abf0010
 2019-11-25 13:45:59 -08:00
TreeHugger Robot
6636ea6da3 Merge "Allow adding EmbeddedWindows without host windows" 2019-11-25 21:44:46 +00:00
Jayachandran Chinnakkannu
6052ca74cd Merge "SmsNumberUtils: Remove usage of the following hidden APIs" 2019-11-25 21:40:14 +00:00
Mathieu Chartier
b541162122 Merge "Pass runtimeFlags to postForkSystemServer" 
am: d9bcf56448

Change-Id: Ib37dbd13b9b50c4aa072e90fa010320d0208207d
 2019-11-25 13:39:18 -08:00
Malcolm Chen
eb7ac68dff Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321 
am: a575fdfc31

Change-Id: I047aeb10e151a1ed9505f2a1dd093e846ff656d8
 2019-11-25 13:38:55 -08:00
Hall Liu
7e5a236984 Merge "Revert submission" 2019-11-25 21:36:11 +00:00
Hall Liu
7bdd72d23e Revert submission 
Reason for revert: Broke a test: b/145140538

Change-Id: If4f76b6f4900bc5ddc0d372e0f0840bec0c7353f
 2019-11-25 21:34:30 +00:00
Mathieu Chartier
d9bcf56448 Merge "Pass runtimeFlags to postForkSystemServer" 2019-11-25 21:33:33 +00:00
Meng Wang
064b674358 Expose API isInEmergencySmsMode 
Bug: 140908357
Test: cts
Change-Id: Ib9c1a4e05f5c8417b93e11cdf6bf81304e57eaec
 2019-11-25 13:33:26 -08:00
Malcolm Chen
a575fdfc31 Merge "Do not consider SIM state for inactive SIM/modem slot." 
am: 445720a321

Change-Id: I757ddca30fac47b084ed03c48642b558a7f9300e
 2019-11-25 13:32:22 -08:00
Mathieu Chartier
742981eca3 Pass runtimeFlags to postForkSystemServer 
Flags are now required by ART.

(cherry-picked from commit 2cb0a4d860)
Bug: 139883463
Bug: 144383344
Test: showmap `pid system_server` and verify
Test: atest BootImageProfileTest
Merged-In: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
Change-Id: I9416ef888557bf0bc0ec7c83f7af1979cac351f8
 2019-11-25 13:32:02 -08:00
Treehugger Robot
445720a321 Merge "Do not consider SIM state for inactive SIM/modem slot." 2019-11-25 21:22:09 +00:00
Kenny Root
e197dad5e9 Merge "RecoverySystem: do not check if socket is closed" am: 6cc2ca0b82 am: f533214352 
am: 9f134c576b

Change-Id: Ifc7c2b7d49a58f572f78e1869717f1c6fcfee5c2
 2019-11-25 12:18:25 -08:00
Kenny Root
9f134c576b Merge "RecoverySystem: do not check if socket is closed" am: 6cc2ca0b82 
am: f533214352

Change-Id: I876167c5501302dfa791f01f7d9493d503ccfbef
 2019-11-25 12:12:22 -08:00
Kenny Root
f533214352 Merge "RecoverySystem: do not check if socket is closed" 
am: 6cc2ca0b82

Change-Id: I308fc54d2d59ede5f98f2576457bba47854344b0
 2019-11-25 12:07:45 -08:00
Nate(Qiang) Jiang
10bc5db45a User binder as identifier for scanResultcallback 
Bug: 143138047
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: I91d68b247490ac33656decc519c39c77bfe786a4
 2019-11-25 12:06:15 -08:00