drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
415,214 Commits 1 Branch 0 Tags
Commit Graph

415214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
easoncylee
36e70fbc7b Merge "CtsAndroidTestBase27ApiSignatureTestCases: Rename CtsAndroidTestBase27ApiSignatureTestCases to CtsAndroidTestBase28ApiSignatureTestCases from TEST MAPPING file." am: c232dbe4a2 
am: f7b4b8a58c

Change-Id: I7c57808d9a34623d607b2d38af3221365d477045
 2019-04-17 14:52:29 -07:00
jiabin
9105753134 Merge "Treat FLAG_MUTE_HAPTIC separately from mFlags." into qt-dev 
am: f02aabe529

Change-Id: Ie96f3971374681e3596494a05c1db6c9fd657a58
 2019-04-17 14:48:43 -07:00
Android Build Merger (Role)
7520465451 Merge changes from topic "am-c9436a7695ce48fda5b772e6490affc9" into qt-dev-plus-aosp 
* changes:
  [automerger skipped] Merge changes from topic "GameDriver" am: e10cb9bd1c am: a0bd6fd610 -s ours am skip reason: change_id If284bd3e0b29cb025833be29fa33179011c151d7 with SHA1 b33ffca825 is in history
  [automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef818 am: 7d1d0c4f63 -s ours am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746c0 is in history
  [automerger skipped] Add global property to store opt-in application package name. am: e23f59aa5a am: 4ce7aa1729 -s ours am skip reason: change_id I49dfcccf387169c072fb9345f7a50c00fcdb0737 with SHA1 2d5a2bb0ad is in history
  [automerger skipped] [GraphicsEnvironment] Add whitelist support. am: 443894f8bb am: 7808ff2cd8 -s ours am skip reason: change_id Ie36ca0173a90a8e48acaca2979ab64bbf92eeaed with SHA1 88c38eb6fe is in history
 2019-04-17 21:43:51 +00:00
Peiyong Lin
10d367bb69 [automerger skipped] Merge changes from topic "GameDriver" am: e10cb9bd1c 
am: a0bd6fd610 -s ours
am skip reason: change_id If284bd3e0b29cb025833be29fa33179011c151d7 with SHA1 b33ffca825 is in history

Change-Id: If8d1d6544819528e5f1eecaeeeb0998a99ff7e5b
 2019-04-17 14:39:35 -07:00
Peiyong Lin
ab728f626f [automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef818 
am: 7d1d0c4f63 -s ours
am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746c0 is in history

Change-Id: If342de345315b97a79917fc1a8a59c94f58eb7d5
 2019-04-17 14:33:46 -07:00
Peiyong Lin
79b0b00bfd [automerger skipped] Add global property to store opt-in application package name. am: e23f59aa5a 
am: 4ce7aa1729 -s ours
am skip reason: change_id I49dfcccf387169c072fb9345f7a50c00fcdb0737 with SHA1 2d5a2bb0ad is in history

Change-Id: I9666a1db8f980ef0b470514e72fa03c2fbe56d60
 2019-04-17 14:29:12 -07:00
Yi Jiang
60ea826a49 Merge "Add unit tests for AttentionManagerService. Make sure it won't crash when OnSwitchUser() is invoked while the bound service is null." into qt-dev 
am: a8853fe282

Change-Id: I6a5a756b107dab76fab2378ce8442dee7318b21b
 2019-04-17 14:27:11 -07:00
Peiyong Lin
ed8ddd5481 [automerger skipped] [GraphicsEnvironment] Add whitelist support. am: 443894f8bb 
am: 7808ff2cd8 -s ours
am skip reason: change_id Ie36ca0173a90a8e48acaca2979ab64bbf92eeaed with SHA1 88c38eb6fe is in history

Change-Id: Ie11d7eaceb57fd95dfc25123f2dc3b4f76250f34
 2019-04-17 14:24:37 -07:00
easoncylee
f7b4b8a58c Merge "CtsAndroidTestBase27ApiSignatureTestCases: Rename CtsAndroidTestBase27ApiSignatureTestCases to CtsAndroidTestBase28ApiSignatureTestCases from TEST MAPPING file." 
am: c232dbe4a2

Change-Id: Ica7050d1751e4db2c0d15e431530ef32b141e3ba
 2019-04-17 14:14:00 -07:00
Peiyong Lin
a0bd6fd610 Merge changes from topic "GameDriver" 
am: e10cb9bd1c

Change-Id: I4627c998da042bfab14769455c874aae2e19b91c
 2019-04-17 14:02:56 -07:00
Android Build Merger (Role)
7b7bdb175e Merge "Merge "Reposition the stack to a similar position upon rotation." into qt-dev am: eaf1f8fd6d" into qt-dev-plus-aosp 2019-04-17 21:02:06 +00:00
Josh Tsuji
97ca6df546 Merge "Reposition the stack to a similar position upon rotation." into qt-dev 
am: eaf1f8fd6d

Change-Id: I7ce06af2cb4513057a3308057a0adfcb5cfb8498
 2019-04-17 14:01:39 -07:00
Android Build Merger (Role)
70934231a8 Merge "Merge "Remove isV2App" am: 992356cc83 am: 0c0ea183d7" into qt-dev-plus-aosp 2019-04-17 20:58:09 +00:00
Nick Kralevich
f46c23bbd7 Merge "Remove isV2App" am: 992356cc83 
am: 0c0ea183d7

Change-Id: I98f3797490d45887e35cdd92b3494759858ca977
 2019-04-17 13:57:07 -07:00
Peiyong Lin
7d1d0c4f63 [GUP] Hard code the name of the whitelist file. 
am: be09eef818

Change-Id: Ib63d6d818600961a5cba4ed2c2d33d654bd1c849
 2019-04-17 13:55:43 -07:00
Felipe Leme
cfb65eec88 Merge "Unhardcoded Augmented Autofill debug constants." into qt-dev 
am: 211ddf7040

Change-Id: Iccd19b19476fc4ead5cd2b2699833b46b6a0d970
 2019-04-17 13:55:08 -07:00
Hui Yu
c9bf2e86b4 Merge "Dump stacktrace of native process when timeout." into qt-dev 
am: fc7f452211

Change-Id: I47dbe24679834ee901ca72bf2129f275a82a1d56
 2019-04-17 13:48:18 -07:00
Peiyong Lin
4ce7aa1729 Add global property to store opt-in application package name. 
am: e23f59aa5a

Change-Id: I2dcd31f5110a5f65cb52a501b2dcfc5b3de75c83
 2019-04-17 13:47:55 -07:00
Peiyong Lin
7808ff2cd8 [GraphicsEnvironment] Add whitelist support. 
am: 443894f8bb

Change-Id: I9353ed28aa66dbc845012bc99fd789a970e6ea09
 2019-04-17 13:38:48 -07:00
Jeff Sharkey
951c617d7d Merge "Adjust MTP to reference by specific volume name." into qt-dev 
am: 383d316707

Change-Id: I0784ca10c6ea717b58f8ee6fc437dee0c24a7a9d
 2019-04-17 13:30:39 -07:00
TreeHugger Robot
f02aabe529 Merge "Treat FLAG_MUTE_HAPTIC separately from mFlags." into qt-dev 2019-04-17 20:30:30 +00:00
TreeHugger Robot
a8853fe282 Merge "Add unit tests for AttentionManagerService. Make sure it won't crash when OnSwitchUser() is invoked while the bound service is null." into qt-dev 2019-04-17 20:28:20 +00:00
Nick Kralevich
0c0ea183d7 Merge "Remove isV2App" 
am: 992356cc83

Change-Id: I3fe68b9e491872ee652307cba84690b94b382c86
 2019-04-17 13:23:05 -07:00
Nathan Harold
afa622c830 [automerger skipped] Merge "Improve Range Checks on CellIdentity Classes" into qt-dev 
am: 29ddcbf1a7 -s ours
am skip reason: change_id I0d3699823be60722a1b741efd60b56f23bbc3e86 with SHA1 251d0a9a99 is in history

Change-Id: Icf93fce7d45e45472db90b5536f13f76bf6428c2
 2019-04-17 13:18:31 -07:00
Colin Cross
e0bcbdb2bd Merge "Update frameworks tests for truth 0.42" into qt-dev-plus-aosp 2019-04-17 20:09:15 +00:00
Android Build Merger (Role)
9420c964a6 Merge "Merge "Make storage a restricted permission - framework" into qt-dev am: d21ce79b30" into qt-dev-plus-aosp 2019-04-17 19:56:46 +00:00
Svetoslav Ganov
e837fdfb66 Merge "Make storage a restricted permission - framework" into qt-dev 
am: d21ce79b30

Change-Id: Iaa8b9eca1495bd0c441d0a3cbc60222404544de3
 2019-04-17 12:54:42 -07:00
Treehugger Robot
c232dbe4a2 Merge "CtsAndroidTestBase27ApiSignatureTestCases: Rename CtsAndroidTestBase27ApiSignatureTestCases to CtsAndroidTestBase28ApiSignatureTestCases from TEST MAPPING file." 2019-04-17 19:49:33 +00:00
Android Build Merger (Role)
5025d9ff10 Merge "Merge "Expand emergency button to match size of container when only item in separated list." into qt-dev am: 0801c16ff0" into qt-dev-plus-aosp 2019-04-17 19:47:00 +00:00
Aaron Heuckroth
f52a9954b1 Merge "Expand emergency button to match size of container when only item in separated list." into qt-dev 
am: 0801c16ff0

Change-Id: I072152e2c274849edb42b179bb59ef0005300ff7
 2019-04-17 12:46:31 -07:00
Josh Tsuji
eaf1f8fd6d Merge "Reposition the stack to a similar position upon rotation." into qt-dev 2019-04-17 19:46:16 +00:00
Android Build Merger (Role)
a7d19ee71e Merge "Merge "Make connection events work for conferences" into qt-dev am: 8dd5bbbdf5" into qt-dev-plus-aosp 2019-04-17 19:41:59 +00:00
Hall Liu
7dd2575b68 Merge "Make connection events work for conferences" into qt-dev 
am: 8dd5bbbdf5

Change-Id: I2415ed7935692054ebaeb6f979e94690ef7b55a3
 2019-04-17 12:40:53 -07:00
TreeHugger Robot
211ddf7040 Merge "Unhardcoded Augmented Autofill debug constants." into qt-dev 2019-04-17 19:40:08 +00:00
Android Build Merger (Role)
058105c4dd Merge "Merge "Remove gMallocLeakZygoteChild." am: 31c0ceba9c am: a3c6c63bbd" into qt-dev-plus-aosp 2019-04-17 19:37:38 +00:00
Christopher Ferris
bac63afdf3 Merge "Remove gMallocLeakZygoteChild." am: 31c0ceba9c 
am: a3c6c63bbd

Change-Id: Id0aaa4efd52930b882405b6582967f56008e1f55
 2019-04-17 12:36:26 -07:00
Brad Ebinger
7bcfa5a680 [automerger skipped] Merge "Merge "Clarify ImsMmTelManager#setRttCapabilitySetting docs" am: 2c0e192436 am: f4efaf0c5a" into qt-dev 
am: 1def0b7d7d -s ours
am skip reason: change_id I3a768979c48c90360046aa0d130b378073524452 with SHA1 56b96fe065 is in history

Change-Id: I73bbacdcaf084dd2f98f8a20edbbe05a5e968d06
 2019-04-17 12:35:46 -07:00
Leland Miller
f666d08e82 Merge "Annotate Part Uri as @NonNull" into qt-dev 
am: 7269961ae3

Change-Id: I4dbf5d1ef0172f177553a51a5b79fcc06e958a60
 2019-04-17 12:31:56 -07:00
Treehugger Robot
e10cb9bd1c Merge changes from topic "GameDriver" 
* changes:
  Rename updatable graphics driver to Game Update Package.
  [GUP] Hard code the name of the whitelist file.
  Add global property to store opt-in application package name.
  [GraphicsEnvironment] Add whitelist support.
 2019-04-17 19:28:15 +00:00
Brad Ebinger
68cc1aef38 Merge "Reorder ImsFeature initialization to handle STATE_READY" into qt-dev 
am: af6f933993

Change-Id: I562246c1995365308d26f44683f75bf5c46b7405
 2019-04-17 12:26:11 -07:00
Treehugger Robot
992356cc83 Merge "Remove isV2App" 2019-04-17 19:22:53 +00:00
TreeHugger Robot
fc7f452211 Merge "Dump stacktrace of native process when timeout." into qt-dev 2019-04-17 19:21:48 +00:00
Quang Luong
16ccf8a37d Merge "Added AccessPoint.matches(AccessPoint) method to match AP objects" into qt-dev 
am: b3730b86d8

Change-Id: Ifbe25344452864098f64bd42ec1fc1e2948ab9f9
 2019-04-17 12:19:45 -07:00
Jeff Sharkey
383d316707 Merge "Adjust MTP to reference by specific volume name." into qt-dev 2019-04-17 19:12:56 +00:00
Nathan Harold
29ddcbf1a7 Merge "Improve Range Checks on CellIdentity Classes" into qt-dev 2019-04-17 18:40:07 +00:00
Christopher Ferris
a3c6c63bbd Merge "Remove gMallocLeakZygoteChild." 
am: 31c0ceba9c

Change-Id: Idf2885d706ba968c12e93b3fae073d6b291bd654
 2019-04-17 11:32:56 -07:00
Svetoslav Ganov
d21ce79b30 Merge "Make storage a restricted permission - framework" into qt-dev 2019-04-17 18:27:06 +00:00
Aaron Heuckroth
0801c16ff0 Merge "Expand emergency button to match size of container when only item in separated list." into qt-dev 2019-04-17 18:26:03 +00:00
Yi Jiang
fa323e7dcb Add unit tests for AttentionManagerService. Make sure it won't crash when OnSwitchUser() is invoked while the bound service is null. 
Bug: 130659721
Test: atest AttentionManagerServiceTest

Change-Id: I71e1252e92eabca02fe2ae9b21596377f22f064c
 2019-04-17 11:21:51 -07:00
Hall Liu
8dd5bbbdf5 Merge "Make connection events work for conferences" into qt-dev 2019-04-17 18:19:52 +00:00