Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
416,087 Commits 3 Branches 0 Tags
cd47318cfbb0bbd3a238c9c361cd1fc9ae5fc0e4
Commit Graph

416087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Liu
cd47318cfb Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev 
am: 5a3afc8ce7

Change-Id: I7bea85b6f657a24b7d8b4292f83ef2f27d79da1e
 2019-04-23 14:12:37 -07:00
Matthew Ng
bbe9c4b226 Merge "Clean up left over prototype code in Navigation Bar" into qt-dev 
am: 6db82f8965

Change-Id: I5e0a9ddb6fbaaf4bf61e43335ad24b01070bf19f
 2019-04-23 13:57:06 -07:00
Pengquan Meng
bb57759766 [automerger skipped] Merge "Add carrier display name related CarrierConfig" am: 570f5dcae1 
am: 9bc0b85dae -s ours
am skip reason: change_id I79836b2912be5223a2269e660bfaadf4aa72b930 with SHA1 057b94f43b is in history

Change-Id: Ib323032763a0521745e1d2ffb4f9484afc7fd107
 2019-04-23 13:51:29 -07:00
Matt Pape
88df035282 Merge "Update settings to properties mapper to use multi property listener." into qt-dev 
am: b4a49aa45b

Change-Id: Ic5700c6044fb1a1cd57803fe5269bf5428a39d07
 2019-04-23 13:46:04 -07:00
Yin-Chia Yeh
67dc3a6490 Merge "Camera: fix null pointer dereference" into qt-dev 
am: dc7de27113

Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8
 2019-04-23 13:40:33 -07:00
Jordan Liu
5a3afc8ce7 Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev 2019-04-23 20:40:09 +00:00
Pengquan Meng
9bc0b85dae Merge "Add carrier display name related CarrierConfig" 
am: 570f5dcae1

Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
 2019-04-23 13:39:26 -07:00
Howard Ro
fb856af45a Merge "Revert "Add apex packages to uid_mapping"" into qt-dev 
am: 14e7eb7108

Change-Id: I3e36cb4117118e0e62c2718d5e42144c210f93cd
 2019-04-23 13:34:43 -07:00
Makoto Onuki
c2e06412fa Merge "pm set-home-activity waits until completion" into qt-dev 
am: ec41ca2aa7

Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425
 2019-04-23 13:28:56 -07:00
Pengquan Meng
570f5dcae1 Merge "Add carrier display name related CarrierConfig" 2019-04-23 20:23:20 +00:00
Nick Chalko
3caecda521 Merge "Don't start an observer without an extcon device" into qt-dev 
am: 9c505c5572

Change-Id: Ied990b9c3cf425a182242ea163565dc77af8769b
 2019-04-23 13:22:45 -07:00
Mike Digman
285250a826 Merge "Sharesheet - make work profile badges render" into qt-dev 
am: aabebff4b8

Change-Id: Ia61d8663873fb2ab60a67167f7d4c66e9eac9c06
 2019-04-23 13:13:17 -07:00
TreeHugger Robot
6db82f8965 Merge "Clean up left over prototype code in Navigation Bar" into qt-dev 2019-04-23 20:12:16 +00:00
Matt Pape
b4a49aa45b Merge "Update settings to properties mapper to use multi property listener." into qt-dev 2019-04-23 19:54:38 +00:00
Joel Galenson
b070dcf5ce Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev 
am: 5bac48f7c0

Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365
 2019-04-23 12:47:52 -07:00
TreeHugger Robot
dc7de27113 Merge "Camera: fix null pointer dereference" into qt-dev 2019-04-23 19:37:25 +00:00
Howard Ro
14e7eb7108 Merge "Revert "Add apex packages to uid_mapping"" into qt-dev 2019-04-23 19:36:25 +00:00
Makoto Onuki
ec41ca2aa7 Merge "pm set-home-activity waits until completion" into qt-dev 2019-04-23 19:36:08 +00:00
Howard Ro
8979ff52f0 Revert "Add apex packages to uid_mapping" 
This reverts commit 67b1e54327.

Bug: 131167067
Reason for revert: b/131167067

Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5
 2019-04-23 19:35:29 +00:00
TreeHugger Robot
9c505c5572 Merge "Don't start an observer without an extcon device" into qt-dev 2019-04-23 19:33:35 +00:00
Sunny Goyal
0b4dea9809 Merge "Adding callback when surface params are applied" into qt-dev 
am: 8cb5228673

Change-Id: I399ae23877efc46ff02d43c1804440fd388cd127
 2019-04-23 12:30:13 -07:00
Chenbo Feng
a5b48c10dc [automerger skipped] Merge "Add a lock to protect persistent stats snapshot" into qt-dev 
am: ac8913be19 -s ours
am skip reason: change_id I73851336452110afb74d6dd1ca5e50047d5b3d4a with SHA1 25243b4eb9 is in history

Change-Id: I30d66ea36a7beee9ccf940c547c47a6f7220e0a2
 2019-04-23 12:23:12 -07:00
TreeHugger Robot
aabebff4b8 Merge "Sharesheet - make work profile badges render" into qt-dev 2019-04-23 19:20:56 +00:00
Michael Groover
ece28e1afa Merge "Add content description to sensors off icon in status bar" into qt-dev 
am: fa7a24ef8e

Change-Id: I7dde4ab81d058514b88a41f747473508074c9898
 2019-04-23 12:17:36 -07:00
TreeHugger Robot
5bac48f7c0 Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev 2019-04-23 19:11:26 +00:00
Arc Wang
f460464eeb Merge "Add action metrics for Wi-Fi provision features" into qt-dev 
am: 831dc426f1

Change-Id: If2b162dd82a0d6c8fd48989ad6a31f0368534047
 2019-04-23 12:04:46 -07:00
Shuo Qian
03b6250d66 [automerger skipped] Merge "Fix urn compare in EmergencyNumber" into qt-dev 
am: 8fb57ca86c -s ours
am skip reason: change_id I585ecafcf9996e24befec2dbe86465a1d5a0f030 with SHA1 3b35404279 is in history

Change-Id: Ic36dba3e62e26f0699467d1ccbfe9087c5d19c29
 2019-04-23 11:47:00 -07:00
Android Build Merger (Role)
58722b4558 Merge "[automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am: aba4de21e0 am: df4acb4d8c -s ours am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1 4740d54243 is in history" into qt-dev-plus-aosp 2019-04-23 18:34:17 +00:00
TreeHugger Robot
8cb5228673 Merge "Adding callback when surface params are applied" into qt-dev 2019-04-23 18:32:26 +00:00
Christopher Ferris
8e0431be66 [automerger skipped] Merge "Move to android_mallopt for malloc debug calls." am: aba4de21e0 
am: df4acb4d8c -s ours
am skip reason: change_id I6ce69465b0c04fae97b3622df2763a2996063d85 with SHA1 4740d54243 is in history

Change-Id: Idaf690cb8b3050a0109a50f036024341a03dd3cc
 2019-04-23 11:31:49 -07:00
Greg Daniel
663ab50411 Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev 
am: 68406a2dd5

Change-Id: I67a9c2e15ec9b6691befec3cd8d439924fbfa5b4
 2019-04-23 11:31:47 -07:00
TreeHugger Robot
ac8913be19 Merge "Add a lock to protect persistent stats snapshot" into qt-dev 2019-04-23 18:19:06 +00:00
Jordan Liu
656f6f8b66 Do not populate SLOT_KEY with wrong slot info 
The slotId is not necessarily the phoneId, so do not broadcast as if it
is. SLOT_KEY is a hidden extra so this should not impact apps in general
(if they need the old extra they can still use the hidden PHONE_KEY).

For select broadcasts like SIM_CARD_STATE_CHANGED, we will manually
populate the slot key. This is a temporary solution to b/130664115 and
we should eventually review and consider making the SLOT_KEY public for
some broadcasts.

Bug: 130664115
Test: manual
Change-Id: I84bd4c6bc4277e32cee9916dd18dd80948a808a0
(cherry picked from commit 21c3aeb49d)
 2019-04-23 18:15:14 +00:00
Christopher Ferris
df4acb4d8c Merge "Move to android_mallopt for malloc debug calls." 
am: aba4de21e0

Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
 2019-04-23 11:03:08 -07:00
Android Build Merger (Role)
d2877e3209 Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am: 65cf57bf6c" into qt-dev-plus-aosp 2019-04-23 18:00:43 +00:00
Santos Cordon
d84514fddc Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev 
am: 65cf57bf6c

Change-Id: I063e124f45cf7d55d04217ad1123db9ce9b14bf0
 2019-04-23 10:59:51 -07:00
TreeHugger Robot
fa7a24ef8e Merge "Add content description to sensors off icon in status bar" into qt-dev 2019-04-23 17:56:46 +00:00
Android Build Merger (Role)
8a8be29510 Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am: aeb929a3f9" into qt-dev-plus-aosp 2019-04-23 17:52:29 +00:00
Fabian Kozynski
fb2a51dee6 Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev 
am: aeb929a3f9

Change-Id: I3d4e3f1684ac08df8a2ea01273e3cf30cb3cb688
 2019-04-23 10:52:05 -07:00
Android Build Merger (Role)
dd57e9dcec Merge "Merge "Add ID field to the Callback" into qt-dev am: 14d351d41b" into qt-dev-plus-aosp 2019-04-23 17:47:27 +00:00
Lucas Dupin
1abc878e7b Merge "Add ID field to the Callback" into qt-dev 
am: 14d351d41b

Change-Id: Icb0cab0607d98b40420bd52a3b3ff8c5bb48fec6
 2019-04-23 10:47:05 -07:00
Christopher Ferris
aba4de21e0 Merge "Move to android_mallopt for malloc debug calls." 2019-04-23 17:45:01 +00:00
Jack Yu
044ae8a5b6 [automerger skipped] Merge "Fixed that emergency alert dialog not popped up" am: 4da7f91b23 
am: 480903bbcb -s ours
am skip reason: change_id Ie563a8f11ac991ab9568f65df6a4d14eebe47c5e with SHA1 974607aac8 is in history

Change-Id: I606baf2e1cdb05e5e286285bc268cb61441e59e0
 2019-04-23 10:44:54 -07:00
Amin Shaikh
ef80b3408f Merge "Set config_bottomDialogCornerRadius for square icon shape." into qt-dev 
am: 4a81a539f4

Change-Id: I14df9268ecd0aba03da1b9618aa1fd21296e251a
 2019-04-23 10:40:24 -07:00
TreeHugger Robot
831dc426f1 Merge "Add action metrics for Wi-Fi provision features" into qt-dev 2019-04-23 17:36:54 +00:00
Shuo Qian
8fb57ca86c Merge "Fix urn compare in EmergencyNumber" into qt-dev 2019-04-23 17:27:26 +00:00
Jack Yu
480903bbcb Merge "Fixed that emergency alert dialog not popped up" 
am: 4da7f91b23

Change-Id: Iba1c3d277171a1727953509438d3cabacb9c45cb
 2019-04-23 10:21:10 -07:00
Vishnu Nair
7ba3da51a6 Merge "[wm] Add tests to check adjust bounds logic will always exit" into qt-dev 
am: f243662ba3

Change-Id: I5574a9c70a774afbe2bd0a1dfea60ceac7f53315
 2019-04-23 10:02:44 -07:00
Android Build Merger (Role)
3c8c88e2da Merge "Merge "Add a timeout for the DNS probe." am: e721b4b83e am: 133fe15fc0" into qt-dev-plus-aosp 2019-04-23 16:58:16 +00:00
Lorenzo Colitti
c7204f689d Merge "Add a timeout for the DNS probe." am: e721b4b83e 
am: 133fe15fc0

Change-Id: I01d3e82828ccba060c35cc34c0f28c0535ed4ac7
 2019-04-23 09:57:47 -07:00