Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
413,618 Commits 3 Branches 0 Tags
a330174d8d132cecce7eebc35b2df1cec30ca80c
Commit Graph

413618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jimmy Chen
a330174d8d p2p: unit tests for WifiP2pGroupList 
Bug: 130138124
Test: atest FrameworksWifiApiTests
Change-Id: I51f6fb88983ce8d0f45139241954ca1de1553fcf
 2019-04-09 01:58:41 +00:00
Android Build Merger (Role)
f0b622a3ec Merge "Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev am: c8723d6ca7 am: 79d2ef76a8" 2019-04-09 01:50:23 +00:00
Seigo Nonaka
cdf7f685a2 Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev am: c8723d6ca7 
am: 79d2ef76a8

Change-Id: Ic5292d5e716be194400ea661eb9b24de5f82b752
 2019-04-08 18:49:09 -07:00
Android Build Merger (Role)
4694ec4486 Merge "Merge "Fixing edge swipe region not updating on device rotation" into qt-dev am: 44519220b6 am: e5f8230f59" 2019-04-09 01:43:34 +00:00
Sunny Goyal
0637fdac7d Merge "Fixing edge swipe region not updating on device rotation" into qt-dev am: 44519220b6 
am: e5f8230f59

Change-Id: Ia4d410686cc46c54829cbb4242452427d175c42e
 2019-04-08 18:43:10 -07:00
Android Build Merger (Role)
330d80842d Merge "Merge changes from topic "tdscdma-rscp" am: 891f195a23 am: 6384b9405f am: 2c383dce26" 2019-04-09 01:38:36 +00:00
Nathan Harold
45eb0c647a Merge changes from topic "tdscdma-rscp" am: 891f195a23 am: 6384b9405f 
am: 2c383dce26

Change-Id: I281167729d994002a53f555f7a73b7e3bedfc50d
 2019-04-08 18:37:04 -07:00
Android Build Merger (Role)
60a8eb442a Merge "[automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51 am: 04946bdad4 -s ours am: f087f1b848 -s ours am skip reason: change_id I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab with SHA1 6abe81ff23 is in history" 2019-04-09 01:31:07 +00:00
Xiangyu/Malcolm Chen
ece8d1589a [automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51 am: 04946bdad4 -s ours 
am: f087f1b848 -s ours
am skip reason: change_id I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab with SHA1 6abe81ff23 is in history

Change-Id: I74aec275bba28ff26a6ba5aecb6891df55fc1be2
 2019-04-08 18:25:25 -07:00
Android Build Merger (Role)
24f796e8ad Merge "[automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 am: 3690c6d927 -s ours am: c02c189aec -s ours am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA1 9302618da6 is in history" 2019-04-09 01:19:33 +00:00
Jack Yu
c6517b3ef5 [automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 am: 3690c6d927 -s ours 
am: c02c189aec -s ours
am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA1 9302618da6 is in history

Change-Id: Ib972dfdbab90c6ad745ba2cd7bbabc1611c7f174
 2019-04-08 18:18:51 -07:00
Android Build Merger (Role)
67b855826e Merge "Merge "More description on logBinaryPushStateChanged" into qt-dev am: 2470fdb507 am: effe92f289" 2019-04-09 01:13:00 +00:00
Howard Ro
a34a297d6c Merge "More description on logBinaryPushStateChanged" into qt-dev am: 2470fdb507 
am: effe92f289

Change-Id: I225b2f267573f9d15e067f632afe3f5087b12126
 2019-04-08 18:12:29 -07:00
TreeHugger Robot
d6ebdab096 Merge "Remove Obsolete Comment" 2019-04-09 01:11:36 +00:00
Ryan Mitchell
9b44c5410a Merge "Allow merging of resources with the same overlayable" into qt-dev am: 636f9ae0c2 
am: c8b5afc692

Change-Id: Idc6826664d7fc26fc21a948d8773c2b66ff7b5ef
 2019-04-08 18:07:26 -07:00
Tyler Gunn
7877ecfeaa Merge "Add @hide API to get the phone account handle for a subId." into qt-dev am: beeb456338 
am: 6fc4da9785

Change-Id: I9fc97963a67b98d2099c5b72a0a98a0229bb3149
 2019-04-08 17:51:22 -07:00
Bryan Mawhinney
589c2eeb29 Merge "Make colorPrimary darker in Theme.DeviceDefault.Settings at night" into qt-dev am: e5b5f30fbe 
am: 1e7e4324e3

Change-Id: I50ad8baed8fd02807d225b59cd57543e51812366
 2019-04-08 17:46:13 -07:00
Bryan Mawhinney
17a82403c1 Merge "Allow themeing of icon in SuspendedAppActivity" into qt-dev am: 353c5cc16a 
am: 066afb6c98

Change-Id: Icdeb61643444b422473098f0bd5588936d9e5e23
 2019-04-08 17:41:00 -07:00
Nathan Harold
5829a1070a Merge "Revert a bad merge from ag/6938423" into qt-dev-plus-aosp 
am: 039a58dffb

Change-Id: Icb517cb39ade1b46c7db6bd0739393efa6dd52c3
 2019-04-08 17:36:00 -07:00
Bill Yi
ded8fe9246 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 568b02ee00 -s ours 
am: 5e7a4efa25 -s ours
am skip reason: subject contains skip directive

Change-Id: Iddb5f2ef52732ae808141889bed7c36830b020be
 2019-04-08 17:31:03 -07:00
Fabian Kozynski
c506a5fc94 Merge "Visual changes to QS header" into qt-dev am: e19335a443 
am: 5e59d60b3d

Change-Id: I7f0a968de014028a0ec68243582e40c7a02d15e7
 2019-04-08 17:30:25 -07:00
sqian
d853f68858 [automerger skipped] Merge "Fix documentation of CallRedirectionService" am: 820a7b5144 am: 3c9e9d1939 -s ours 
am: 2881e89cee -s ours
am skip reason: change_id I48f60b3c4a465e22250aa513a4d7d73f82375426 with SHA1 87833ee867 is in history

Change-Id: I137c9203ef9c40b947a73bb6696290419d167dff
 2019-04-08 17:23:21 -07:00
Seigo Nonaka
79d2ef76a8 Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev 
am: c8723d6ca7

Change-Id: I4615fabbdf8e9df209f4de8cf5461e87a0f4931c
 2019-04-08 16:43:46 -07:00
Remi NGUYEN VAN
1b667cf1d5 Merge "[automerger skipped] Merge "Add FrameworksNetTests dependency on libcgrouprc" am: 3729b26f8a -s ours am: 204ef43f56 -s ours 
am: 1704d678ff -s ours
am skip reason: change_id Ifcfe4df81caf8ede2e4e66a76552cb3200378fa8 with SHA1 061cec7755 is in history

Change-Id: If2094e6df4674d0c32f7d79b09b7f182d3284b3f
 2019-04-08 16:40:42 -07:00
Sunny Goyal
e5f8230f59 Merge "Fixing edge swipe region not updating on device rotation" into qt-dev 
am: 44519220b6

Change-Id: I81282cd8517caa02570f339c1e0577dab7b58f49
 2019-04-08 16:38:02 -07:00
Kyeongkab.Nam
4a57bab027 Merge "Merge "Fix exception of unregisterCallback when callback is not registered" am: 43b75cad9e am: d526de2ca2" into qt-dev-plus-aosp 
am: 1b846b4604

Change-Id: If20741319174bf3bb9a9addddc47b8fc55ec023f
 2019-04-08 16:32:17 -07:00
Nathan Harold
2c383dce26 Merge changes from topic "tdscdma-rscp" am: 891f195a23 
am: 6384b9405f

Change-Id: I2332a71ecde8a82d74d3e0e6ea0ce348aefe54aa
 2019-04-08 16:28:35 -07:00
Xiangyu/Malcolm Chen
f087f1b848 [automerger skipped] Merge changes from topics "126864501", "129296702" am: 9f80ec1d51 
am: 04946bdad4 -s ours
am skip reason: change_id I3d50fb30980b5e2d2240bd186fb15c7f2a7c21ab with SHA1 6abe81ff23 is in history

Change-Id: Ide77be398795ba819304d5d51a85502fa7540888
 2019-04-08 16:21:35 -07:00
TreeHugger Robot
c8723d6ca7 Merge "Pass runMax = 1 to stop unnecessary itemization" into qt-dev 2019-04-08 23:18:59 +00:00
Lucas Lin
d135418cbc Merge "Merge "Prevent SIGN_IN notification pop up several times" am: 83152b1e5f am: d454c3c276" into qt-dev-plus-aosp 
am: b1a0373791

Change-Id: I6db72138f6ba72f35f027ff5cf7e908dcb8ad121
 2019-04-08 16:18:14 -07:00
Jack Yu
c02c189aec [automerger skipped] Merge "Fixed incorrect service state populated" am: 5f8b1bfe66 
am: 3690c6d927 -s ours
am skip reason: change_id I7fab7090c22390914af024c44bffd643c13f33e5 with SHA1 9302618da6 is in history

Change-Id: I613e97953a26bdfffb9a57652991edc7d69c5b21
 2019-04-08 16:15:34 -07:00
Remi NGUYEN VAN
58fa981cac Merge "Merge "Add NetworkStackTests dependency on libdl_android" am: 1178972d68 am: 070e341303" into qt-dev-plus-aosp 
am: 074053853c

Change-Id: I23e1fc7abd34350389ddbe6a50c5d5bb7be44838
 2019-04-08 16:03:42 -07:00
Nathan Harold
6384b9405f Merge changes from topic "tdscdma-rscp" 
am: 891f195a23

Change-Id: I0fb6c54779d7505d7fc4239ac2bc07db11601a5f
 2019-04-08 15:51:59 -07:00
Anil Admal
d43326dac5 Merge "Merge "Extend support for requestRouteToHostAddress for backward compatibility" am: fa45c06a62 am: b85b487e31" into qt-dev-plus-aosp 
am: 7fecc34996

Change-Id: Ifa4ec98d5c942522dfd569664f169fa841d495ed
 2019-04-08 15:49:09 -07:00
Xiangyu/Malcolm Chen
04946bdad4 Merge changes from topics "126864501", "129296702" 
am: 9f80ec1d51

Change-Id: Iadd23b2af9d4f85d88f6915d042641d2f481a784
 2019-04-08 15:43:09 -07:00
Nathan Harold
891f195a23 Merge changes from topic "tdscdma-rscp" 
* changes:
  Fix getLevel for CellSignalStrengthTdscdma
  Rename LevelCalculationMethod Constant
 2019-04-08 22:42:35 +00:00
Lorenzo Colitti
5870f38e44 Merge "Merge "Disable InetDiagSocketTest in a better way." am: c28356b9c6 am: cc94ad60b0" into qt-dev-plus-aosp 
am: 8818a8c6c7

Change-Id: I1fcb9ca292777fb017e9108a3e12cffba87e1985
 2019-04-08 15:34:52 -07:00
Xiangyu/Malcolm Chen
9f80ec1d51 Merge changes from topics "126864501", "129296702" 
* changes:
  Changing default phone capability.
  Remove hidden IntDef in java doc.
  Add @hide API to return whether a modem stack is enabled or not.
 2019-04-08 22:29:36 +00:00
TreeHugger Robot
44519220b6 Merge "Fixing edge swipe region not updating on device rotation" into qt-dev 2019-04-08 22:28:08 +00:00
Jack Yu
3690c6d927 Merge "Fixed incorrect service state populated" 
am: 5f8b1bfe66

Change-Id: I5213f601645025f3df5b8e8a5ba8e61d6b9901e1
 2019-04-08 15:24:45 -07:00
Mark Renouf
504d05c106 Merge "BubbleData [2/n]: adds Listener interface" into qt-dev am: 4c916ecf7c 
am: 5381f32888

Change-Id: I97039e1428554a15af19dea0914aba29837926e2
 2019-04-08 15:20:46 -07:00
Shuo Qian
5e5d6b25b5 Merge "[automerger skipped] Merge "Clean up Call redirection setting" am: 9d6ac63e5e am: d4b3f65d35 -s ours 
am: ec91922c54 -s ours
am skip reason: change_id I9cb569bfd1ef5fba7958bb2e5f42f05e300e3358 with SHA1 fa9460a6f0 is in history

Change-Id: I35b4681e47db8c1bd3a4418e9c52f880c5268a4f
 2019-04-08 15:14:56 -07:00
Winson Chung
32e4cadbbb Merge "Merge "Defer broadcasting ACTION_DEFERRED_ACTIVITY_CHANGED until actual change" into qt-dev am: f883ea697e" into qt-dev-plus-aosp 
am: 310c197142

Change-Id: I3c0216435494cfb868a8dbbd1d2492bc584091a3
 2019-04-08 15:06:34 -07:00
Tobias Thierer
cb62f8be16 Merge "Merge changes I4e32a588,I202c5653 am: 003ab94333 am: b7ca85651f" into qt-dev-plus-aosp 
am: eb553b0df7

Change-Id: I5db1636a8c694e8b10c04800e7959747304c6b1b
 2019-04-08 14:54:22 -07:00
Bookatz
3672ed7304 Merge "Merge "UserRestrictionsUtil.isValidRestriction wtfs" into qt-dev am: a126a24c52" into qt-dev-plus-aosp 
am: 3f176785c5

Change-Id: Idd5f4618e6fdb73121ba2746bee91636fece7241
 2019-04-08 14:39:54 -07:00
Howard Ro
effe92f289 Merge "More description on logBinaryPushStateChanged" into qt-dev 
am: 2470fdb507

Change-Id: Iffc3b16b2a8e68d7dacb11f7770f149fe238c4fb
 2019-04-08 14:35:43 -07:00
Android Build Merger (Role)
cc9dd574ea Merge "Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours am: 718d5723b0 -s ours am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history" 2019-04-08 21:28:54 +00:00
Jack Yu
12687e7c29 Merge "[automerger skipped] Merge "Improved the debug message" am: cacfab6728 am: 253a139102 -s ours 
am: 718d5723b0 -s ours
am skip reason: change_id If786d51b35380f606bc388e29a441bb24a2792e0 with SHA1 0c92c23951 is in history

Change-Id: I8d85d94af99802728441860a429263cacb7802ba
 2019-04-08 14:28:32 -07:00
Ryan Mitchell
c8b5afc692 Merge "Allow merging of resources with the same overlayable" into qt-dev 
am: 636f9ae0c2

Change-Id: I8080dbb3c9cca7bcea2c8b4295f06e628c73e609
 2019-04-08 14:26:12 -07:00
Miguel de Dios
ce032b6769 Merge "Revert a bad merge from ag/6938423" 2019-04-08 21:24:36 +00:00