Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
444,061 Commits 3 Branches 0 Tags
45d4d19fc584f44246f511f3ab203d23459fb99f
Commit Graph

444061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
45d4d19fc5 [automerger skipped] Merge "Fix review comments on aosp/1213524" am: a77fbc2539 -s ours am: 70158f3240 -s ours 
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 2dda9e0627 is in history

Change-Id: I6a138aa326a628fca7eda309f5627dd47a0ca56e
 2020-02-11 03:52:28 +00:00
Automerger Merge Worker
70158f3240 [automerger skipped] Merge "Fix review comments on aosp/1213524" am: a77fbc2539 -s ours 
am skip reason: Change-Id I621cfbe165996c67b201ca2dd2f95a5ab9af10ee with SHA-1 2dda9e0627 is in history

Change-Id: I1016fc76028aeafa9f15841b4e2951957aa11578
 2020-02-11 03:43:38 +00:00
Aaron Huang
a77fbc2539 Merge "Fix review comments on aosp/1213524" 2020-02-11 03:33:08 +00:00
Automerger Merge Worker
6dbd32d54f Merge "Dump prereboot information before device reboot" am: 61981ca7be am: 4c41bd0988 
Change-Id: Icda9436bc956241b5197e982c9b13b3085c906c8
 2020-02-11 03:17:41 +00:00
Automerger Merge Worker
4c41bd0988 Merge "Dump prereboot information before device reboot" am: 61981ca7be 
Change-Id: I37ca76d0a5183cf099894d7e8ac7c94b13906688
 2020-02-11 03:08:55 +00:00
Jerry Chang
61981ca7be Merge "Dump prereboot information before device reboot" 2020-02-11 02:49:29 +00:00
Automerger Merge Worker
685638d818 [automerger skipped] Merge "[adbwifi]: Add Settings metrics for adb wireless." am: 5ff37df1ab -s ours am: 5e4c2f7898 -s ours 
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 2ebefbd0dc is in history

Change-Id: I8affec693a54a64c535c345fd8524751185ebb25
 2020-02-11 02:15:03 +00:00
Automerger Merge Worker
042f26589d Merge "Hide Adhoc conference call API." am: 32c29d1ee6 am: 4ccffaef5f 
Change-Id: Idff53b481334b0635560d1a89906d182b80c8972
 2020-02-11 02:14:50 +00:00
Automerger Merge Worker
5e4c2f7898 [automerger skipped] Merge "[adbwifi]: Add Settings metrics for adb wireless." am: 5ff37df1ab -s ours 
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 2ebefbd0dc is in history

Change-Id: I85b0a97898ccd5898e6458e453b69885a756c0be
 2020-02-11 02:00:43 +00:00
Automerger Merge Worker
4ccffaef5f Merge "Hide Adhoc conference call API." am: 32c29d1ee6 
Change-Id: I5e0835eb457c3dcd20067936942f948869087abb
 2020-02-11 02:00:20 +00:00
Automerger Merge Worker
995383072c Merge "Remove usages of @hide methods in telephony code." am: 841859205b am: 18f85c674a 
Change-Id: I0b3193dc60a7d74f49b925cc27cd0323962436e8
 2020-02-11 01:44:17 +00:00
Automerger Merge Worker
77a55515cd Merge "Remove usage of MetricsLogger in SmsApplication." am: b34d5a74fb am: 215397798c 
Change-Id: I8b97798bac55e9083bc72c993a3733244b69b07d
 2020-02-11 01:43:14 +00:00
Treehugger Robot
5ff37df1ab Merge "[adbwifi]: Add Settings metrics for adb wireless." 2020-02-11 01:42:49 +00:00
Tyler Gunn
32c29d1ee6 Merge "Hide Adhoc conference call API." 2020-02-11 01:40:54 +00:00
Automerger Merge Worker
18f85c674a Merge "Remove usages of @hide methods in telephony code." am: 841859205b 
Change-Id: Id16457402dafae755582d06e67b9a9f7cc98bbc3
 2020-02-11 01:32:27 +00:00
Automerger Merge Worker
215397798c Merge "Remove usage of MetricsLogger in SmsApplication." am: b34d5a74fb 
Change-Id: I9811bc642c0bb38dd9ea6f4dde7d7465fe990fb7
 2020-02-11 01:31:49 +00:00
Xiangyu/Malcolm Chen
841859205b Merge "Remove usages of @hide methods in telephony code." 2020-02-11 01:17:25 +00:00
Xiangyu/Malcolm Chen
b34d5a74fb Merge "Remove usage of MetricsLogger in SmsApplication." 2020-02-11 01:17:07 +00:00
Joshua Duong
793f25df07 [adbwifi]: Add Settings metrics for adb wireless. 
Bug: 111434128, 119492574

Test: make
Exempt-From-Owner-Approval: Cherry-pick
Change-Id: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
Merged-In: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
 2020-02-11 00:10:21 +00:00
Automerger Merge Worker
b9f2f13027 Merge "[GWP-ASan] Maybe initialise GWP-ASan from Zygote." am: bd37583811 am: ea611103df 
Change-Id: Ifcfbb5db2271cdb5309bc8dce311753f8fbbc376
 2020-02-10 23:58:39 +00:00
Automerger Merge Worker
ea611103df Merge "[GWP-ASan] Maybe initialise GWP-ASan from Zygote." am: bd37583811 
Change-Id: I2fc64ff4d59e7089619be82eb7ef9907bf0de04c
 2020-02-10 23:44:25 +00:00
Automerger Merge Worker
1f5ff84804 [automerger skipped] Merge "[adbwifi] Add Settings metrics for adb wireless." into stage-aosp-master am: 54701eab76 -s ours 
am skip reason: Change-Id Ib18cefda42fd778f5868ba63007b0b18e83e2c4d with SHA-1 5bc3c58134 is in history

Change-Id: Ibe601a5fd474fcdb858fe5ee60bc8996e627e0c1
 2020-02-10 23:41:24 +00:00
Automerger Merge Worker
87adc2705f Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c am: 940853b36f 
Change-Id: If38d061113e23af9f7edc4609130bd13b3466686
 2020-02-10 23:40:42 +00:00
Mitch Phillips
bd37583811 Merge "[GWP-ASan] Maybe initialise GWP-ASan from Zygote." 2020-02-10 23:35:26 +00:00
Joshua Duong
54701eab76 Merge "[adbwifi] Add Settings metrics for adb wireless." into stage-aosp-master 2020-02-10 23:31:01 +00:00
Automerger Merge Worker
940853b36f Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" am: 88fba38a1c 
Change-Id: If1599cabe081cd259051ffd36e2a597443919de7
 2020-02-10 23:29:58 +00:00
Joshua Duong
2ebefbd0dc [adbwifi] Add Settings metrics for adb wireless. 
Bug: 111434128, 119492574

Test: make
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
Change-Id: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
(cherry picked from commit 5bc3c58134)
 2020-02-10 23:27:28 +00:00
Joshua Duong
cbfb6a9221 Merge "[adbwifi] Add Settings metrics for adb wireless." into qt-qpr1-dev-plus-aosp 2020-02-10 23:25:30 +00:00
Joshua Duong
5bc3c58134 [adbwifi] Add Settings metrics for adb wireless. 
Bug: 111434128, 119492574

Test: make
Exempt-From-Owner-Approval: Cherry-pick
Merged-In: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
Change-Id: Ib18cefda42fd778f5868ba63007b0b18e83e2c4d
 2020-02-10 23:24:11 +00:00
Tyler Gunn
a967af5514 Hide Adhoc conference call API. 
Marking the adhoc conference call API as @hide.

Test: make -j update-api
Bug: 148165780
Change-Id: I447ec317c66f0c1b4e7a828635b5dcf8b144e32a
 2020-02-10 15:19:07 -08:00
Treehugger Robot
88fba38a1c Merge "BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission" 2020-02-10 23:16:52 +00:00
Automerger Merge Worker
ccc1ad01e8 Merge "Update BluetoothPbap class description to indicate how to create an instance of the class, add intdef to return value of BluetoothPbap#getConnectionState, and move all SystemApis to require the BLUETOOTH_PRIVILEGED permission" am: cc89e59203 am: 687ef90ac5 
Change-Id: I6fd018513283a85d09da6ed7c229c6664c04d0dd
 2020-02-10 23:11:35 +00:00
Automerger Merge Worker
6afc99773e Merge "Add OWNERS file for BootImageProfileTest" am: 95154ae4b2 am: a56b6ff35c 
Change-Id: I62c58b512ecad721ae31d0efc968e6194c1e42d1
 2020-02-10 23:11:21 +00:00
Automerger Merge Worker
63389badab Merge "Remove usage of android.os.Build.IS_USER" am: 9ead9f02ce am: d8d545d048 
Change-Id: Ib2db703ea02bfd8b9a689b0a17007764cc3ff6e2
 2020-02-10 23:10:47 +00:00
Automerger Merge Worker
687ef90ac5 Merge "Update BluetoothPbap class description to indicate how to create an instance of the class, add intdef to return value of BluetoothPbap#getConnectionState, and move all SystemApis to require the BLUETOOTH_PRIVILEGED permission" am: cc89e59203 
Change-Id: I96de10ac130e3737911c050e0a76e30602c85721
 2020-02-10 22:57:46 +00:00
Automerger Merge Worker
a56b6ff35c Merge "Add OWNERS file for BootImageProfileTest" am: 95154ae4b2 
Change-Id: Idec8589ecb2fa726b0bf23379393d9428a18b71d
 2020-02-10 22:56:36 +00:00
Automerger Merge Worker
d8d545d048 Merge "Remove usage of android.os.Build.IS_USER" am: 9ead9f02ce 
Change-Id: I4b6c2001aa0ec30fa431cf473f09166e3e196b3c
 2020-02-10 22:55:30 +00:00
Treehugger Robot
cc89e59203 Merge "Update BluetoothPbap class description to indicate how to create an instance of the class, add intdef to return value of BluetoothPbap#getConnectionState, and move all SystemApis to require the BLUETOOTH_PRIVILEGED permission" 2020-02-10 22:39:57 +00:00
Malcolm Chen
8acb1c4707 Remove usage of MetricsLogger in SmsApplication. 
Bug: 140908357
Test: build
Change-Id: I285de118d291fc3112518419fb92544f0ba942d2
Merged-In: I285de118d291fc3112518419fb92544f0ba942d2
 2020-02-10 22:37:23 +00:00
Mathieu Chartier
95154ae4b2 Merge "Add OWNERS file for BootImageProfileTest" 2020-02-10 22:36:36 +00:00
Xiangyu/Malcolm Chen
9ead9f02ce Merge "Remove usage of android.os.Build.IS_USER" 2020-02-10 22:36:00 +00:00
Rahul Sabnis
eaa088f14b BluetoothA2dpSink System APIs now require BLUETOOTH_ADMIN permission 
Bug: 149216030
Test: Manual
Change-Id: Ib28c7f3133eb96c1ba0b43c8b140babde699d5f4
 2020-02-10 14:02:25 -08:00
Automerger Merge Worker
4c0d1a02b6 Merge "Add TEST_MAPPING for gating and logging" am: 05fb4434f3 am: 5d3e5fb3b5 
Change-Id: Ie1963bb7965827d9f9985b08c78e70b2de3319a7
 2020-02-10 21:35:05 +00:00
Automerger Merge Worker
5d3e5fb3b5 Merge "Add TEST_MAPPING for gating and logging" am: 05fb4434f3 
Change-Id: I701ef53dada696ee5f6e45d8539ca385a08ffc29
 2020-02-10 21:24:31 +00:00
Treehugger Robot
05fb4434f3 Merge "Add TEST_MAPPING for gating and logging" 2020-02-10 21:12:10 +00:00
Automerger Merge Worker
618fa08c1c Merge "Remove testTokenize" am: 52c5601801 am: f6a2f14eb6 
Change-Id: I38a40108f3138283535bfc992fc0b98ab8dca841
 2020-02-10 20:45:09 +00:00
Automerger Merge Worker
0341e15f07 Merge "Refactor CountryDetectorService" into qt-qpr1-dev am: 7d26587263 
Change-Id: I45efb245c646105874bc97bed57c6d36bbbcc979
 2020-02-10 20:34:06 +00:00
Automerger Merge Worker
f6a2f14eb6 Merge "Remove testTokenize" am: 52c5601801 
Change-Id: I9a4b23eef55735801768c750d24b3cee5dd79501
 2020-02-10 20:33:29 +00:00
Automerger Merge Worker
7dcc67912b Merge "Fix flaky sysui crash in devicehealthchecks test." into qt-qpr1-dev am: 72be6295c0 
Change-Id: I96d2dd32ecdd2af08a454be40efc30eac375b815
 2020-02-10 20:33:29 +00:00
TreeHugger Robot
7d26587263 Merge "Refactor CountryDetectorService" into qt-qpr1-dev 2020-02-10 20:32:35 +00:00