TreeHugger Robot
04ecba71fa
Merge "Make maximum size of an error report configurable."
2019-12-16 10:44:02 +00:00
Automerger Merge Worker
076fc6b951
[automerger skipped] Merge "Update TelephonyManager#getNai docs for new device ID requirements" am: 2cf7b94daf am: 5e2a0a3321 am: 30496f4c57 -s ours
...
am skip reason: Change-Id I99aa929ce7c734d9449fe23f6f483af4463fed19 with SHA-1 248a6b38f2
2019-12-16 10:40:42 +00:00
Automerger Merge Worker
30496f4c57
Merge "Update TelephonyManager#getNai docs for new device ID requirements" am: 2cf7b94daf am: 5e2a0a3321
...
Change-Id: I9372e5280310bed09b1247b42f7d2c304894a83d
2019-12-16 10:20:34 +00:00
Michael Groover
5e2a0a3321
Merge "Update TelephonyManager#getNai docs for new device ID requirements"
...
am: 2cf7b94daf
2019-12-16 02:02:08 -08:00
Oli Lan
b8edc67908
Merge "Add rollback parameters when submitting sessions to apexd."
2019-12-16 09:42:15 +00:00
TreeHugger Robot
e754074a05
Merge "move privapp_whitelist_com.android.storagemanager to system_ext"
2019-12-16 09:19:31 +00:00
Treehugger Robot
2cf7b94daf
Merge "Update TelephonyManager#getNai docs for new device ID requirements"
2019-12-16 09:07:50 +00:00
Jason Chiu
ebdc43b9fe
Merge "[SettingsLib] Add preference click metric log"
2019-12-16 08:58:34 +00:00
TreeHugger Robot
83a8a3bcfd
Merge "Add task snapshot for home task"
2019-12-16 08:42:31 +00:00
Automerger Merge Worker
ac5d38ec9f
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" am: 706ac54f75 am: 2957a01905 am: 375bfacf9e
...
Change-Id: Ia3e23b2f39aa83a96b0abbdee282512b6acd3e0e
2019-12-16 08:30:09 +00:00
Automerger Merge Worker
375bfacf9e
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED" am: 706ac54f75 am: 2957a01905
...
Change-Id: I631ce9139237f91476000c8476b21f09edfcd788
2019-12-16 08:15:35 +00:00
Jayachandran Chinnakkannu
2957a01905
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED"
...
am: 706ac54f75
2019-12-16 00:04:48 -08:00
Jayachandran Chinnakkannu
706ac54f75
Merge "Remove READ_SMS permission for ACTION_SMS_MMS_DB_CREATED"
2019-12-16 07:03:43 +00:00
Alex Buynytskyy
247901bb4f
Merge "[incremental] Java service and shell command handler"
2019-12-16 06:44:49 +00:00
Sungsoo Lim
dbd8737bce
Merge "Revert "Revert "Make media command be a shell command"""
2019-12-16 06:40:53 +00:00
Jason Chiu
4f6a1c0fc4
[SettingsLib] Add preference click metric log
...
Add a method to log preference click event.
The log order of priority is:
1. preference key
2. preference intent component name
3. preference intent action
4. preference fragment
Bug: 137559984
Test: robotest
Change-Id: Idecd7ada120a70b523ccd134c878f5753183211b
2019-12-16 14:19:37 +08:00
TreeHugger Robot
a15562ee8c
Merge "AML: Enable log and trace for non-process-switch launch"
2019-12-16 05:04:28 +00:00
TreeHugger Robot
aa6de85d0f
Merge "Add wtf log when starting activities with different uids"
2019-12-16 05:04:16 +00:00
Automerger Merge Worker
622b228f79
[automerger skipped] Merge "Replaced Build.IS_DEBUGGABLE" am: 81491a1265 am: 503ceb05ec am: 4220c8e086 -s ours
...
am skip reason: Change-Id If3ca3171f8c09552642e797fb0ce2d00ccacc999 with SHA-1 76c72ec002
2019-12-16 04:38:23 +00:00
Automerger Merge Worker
4220c8e086
Merge "Replaced Build.IS_DEBUGGABLE" am: 81491a1265 am: 503ceb05ec
...
Change-Id: Ib7cd8e99e1fe9d6c22c2b81c02b22eca464cb313
2019-12-16 04:25:45 +00:00
Daniel Bright
503ceb05ec
Merge "Replaced Build.IS_DEBUGGABLE"
...
am: 81491a1265
2019-12-15 20:11:04 -08:00
Treehugger Robot
81491a1265
Merge "Replaced Build.IS_DEBUGGABLE"
2019-12-16 02:32:58 +00:00
TreeHugger Robot
97a17d5658
Merge "Merge ActivityDisplay and DisplayContent into one class (77/n)"
2019-12-16 02:12:42 +00:00
TreeHugger Robot
70b6079730
Merge "Add a whitelist to control packages eligible for rollback (1/n)"
2019-12-16 01:33:33 +00:00
tim peng
8c5c5d9dfe
Merge "Remove HD audio from audio codec list"
2019-12-16 01:24:48 +00:00
Sooraj Sasindran
91636fdcd7
Merge "Make requestModemActivityInfo a system api"
2019-12-15 20:48:47 +00:00
Jing Ji
81a6672c76
Merge "Add performance test for OomAdjuster"
2019-12-15 20:04:50 +00:00
Sooraj Sasindran
2cae4e6680
Make requestModemActivityInfo a system api
...
Make requestModemActivityInfo a system api
Bug: 140908357
Test: Build
Change-Id: Id3db96212af713de09ef761629db86ecd02cfe8a
2019-12-15 18:21:48 +00:00
Philip P. Moltmann
241bb269a8
Merge "Pipe featureId from app to noteOp in BT code"
2019-12-15 17:11:12 +00:00
TreeHugger Robot
74e0e156a3
Merge "Import translations. DO NOT MERGE"
2019-12-15 05:46:28 +00:00
Etan Cohen
6d4ee4f2cc
Merge "wificond: move wificond files to unbundled file group"
2019-12-14 19:15:04 +00:00
Philip P. Moltmann
a722cefbdb
Pipe featureId from app to noteOp in BT code
...
Test: atest CtsAppOpsTestCases (Now with canary test for this code)
Bug: 136595429
Change-Id: I90bb6b017da4f03038fce76760a860390b727f00
2019-12-14 10:38:19 -08:00
Automerger Merge Worker
6dbbed0620
Merge "Pipe featureId from app to noteOp in BT code" am: 775540c6d6 am: 6f2b986ee4 am: 956b783f7c
...
Change-Id: I8dc7ae9a29a13982591f73e1a8d59b2b9f0cc4ef
2019-12-14 18:17:33 +00:00
Automerger Merge Worker
956b783f7c
Merge "Pipe featureId from app to noteOp in BT code" am: 775540c6d6 am: 6f2b986ee4
...
Change-Id: Ia2d0a51a73020b81cb8991ff783fa826328265cc
2019-12-14 18:00:45 +00:00
Antoan Angelov
9dba368079
Merge "Call rebuildList() from sharesheet's handlePackagesChanged()."
2019-12-14 17:49:35 +00:00
Philip P. Moltmann
6f2b986ee4
Merge "Pipe featureId from app to noteOp in BT code"
...
am: 775540c6d6
2019-12-14 09:42:22 -08:00
Treehugger Robot
775540c6d6
Merge "Pipe featureId from app to noteOp in BT code"
2019-12-14 17:36:47 +00:00
Automerger Merge Worker
4dc9b1fa83
Merge "more precise definition for undecorated remoteviews" into qt-qpr1-dev am: 90387eb27f am: 5c8eab6ae2
...
Change-Id: I340a66a389dce20993627de0f6c966620b48aa1a
2019-12-14 17:16:52 +00:00
Automerger Merge Worker
5c8eab6ae2
Merge "more precise definition for undecorated remoteviews" into qt-qpr1-dev am: 90387eb27f
...
Change-Id: I118196d4578af0d0c2cf426068a288dd82731aba
2019-12-14 17:01:32 +00:00
TreeHugger Robot
90387eb27f
Merge "more precise definition for undecorated remoteviews" into qt-qpr1-dev
2019-12-14 16:49:31 +00:00
TreeHugger Robot
39d4fd7077
Merge "Fix "atest ResolverActivityTest" UPDATE_APP_OPS_STATS failure."
2019-12-14 16:06:03 +00:00
Etan Cohen
5b4cdd863e
Merge "Wificond: transfer implementation to android.net.wifi"
2019-12-14 15:04:14 +00:00
Automerger Merge Worker
eafe775f6a
Merge changes from topic "dec13_netrevert" am: 1aab035706 am: 6da484b455 am: 23799f4e4b
...
Change-Id: I266bc6772d5cd2068caa35ecc98b077da2c5255f
2019-12-14 08:31:48 +00:00
Automerger Merge Worker
76a4341fef
[automerger skipped] Merge "remove API RoleManager.getFinancialSms" am: c0fa362e1b am: 679980cbca am: 560eac460c -s ours
...
am skip reason: Change-Id Ib57d0fc189b6c894227894ee02b592f7ee46f22f with SHA-1 d6b2673181
2019-12-14 08:31:22 +00:00
Automerger Merge Worker
23799f4e4b
Merge changes from topic "dec13_netrevert" am: 1aab035706 am: 6da484b455
...
Change-Id: I9f6e7079d8e5d2e978ba618800c98df6e19e022b
2019-12-14 08:20:21 +00:00
Automerger Merge Worker
560eac460c
Merge "remove API RoleManager.getFinancialSms" am: c0fa362e1b am: 679980cbca
...
Change-Id: I6f5db398a52a01b3fcc5b7a672d39f92dcd93479
2019-12-14 08:19:38 +00:00
Andrew Chant
6da484b455
Merge changes from topic "dec13_netrevert"
...
am: 1aab035706
2019-12-14 00:06:02 -08:00
Chen Xu
679980cbca
Merge "remove API RoleManager.getFinancialSms"
...
am: c0fa362e1b
2019-12-14 00:02:03 -08:00
Andrew Chant
1aab035706
Merge changes from topic "dec13_netrevert"
...
* changes:
Revert "[NS A24] Add an object to represent changes in assignment"
Revert "[NS A25] Send all listen callbacks after all rematches"
Revert "[NS A26] Move available callbacks out of the rematch computation"
Revert "[NS A27] Remove useless logs and a useless var"
2019-12-14 07:10:08 +00:00
Chen Xu
c0fa362e1b
Merge "remove API RoleManager.getFinancialSms"
2019-12-14 06:57:48 +00:00
