OSDN Git Service
Aaron Huang [Wed, 24 Apr 2019 04:26:03 +0000 (21:26 -0700)]
Merge "Move NattKeepalivePacketData out of the framework" am:
833edcbb1b
am:
cab3f447ae
Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
Aaron Huang [Wed, 24 Apr 2019 04:17:26 +0000 (21:17 -0700)]
Merge "Move NattKeepalivePacketData out of the framework"
am:
833edcbb1b
Change-Id: I3c291d378ed3dc54199708fdc188a908ccb3ee08
Seigo Nonaka [Wed, 24 Apr 2019 04:16:08 +0000 (21:16 -0700)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
am:
5f873a09a0
Change-Id: I1995dee390d20f18d223addaa6232765dfded8a5
Aaron Huang [Wed, 24 Apr 2019 04:00:56 +0000 (04:00 +0000)]
Merge "Move NattKeepalivePacketData out of the framework"
TreeHugger Robot [Wed, 24 Apr 2019 03:35:15 +0000 (03:35 +0000)]
Merge "Fix performance regression by fixing keys used in Typeface.Builder" into qt-dev
Emilian Peev [Wed, 24 Apr 2019 02:50:00 +0000 (19:50 -0700)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
am:
f8d04b2d2f
Change-Id: I5a99fd6443d6c5dbd85b65a14297cc83a8bce34e
TreeHugger Robot [Wed, 24 Apr 2019 02:28:39 +0000 (02:28 +0000)]
Merge "Check and configure pixel format when locking canvas" into qt-dev
Matt Pietal [Wed, 24 Apr 2019 02:23:43 +0000 (19:23 -0700)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
am:
c35533726d
Change-Id: I7fe474e9c3311e1d009ca419b3ac6883707a2c49
Robert Snoeberger [Wed, 24 Apr 2019 02:17:49 +0000 (19:17 -0700)]
Merge "Transition to bold when shrinking clock" into qt-dev
am:
993e5dacd7
Change-Id: Iedd2231047baa4ff38537f560a9ac554f247699b
Hyundo Moon [Wed, 24 Apr 2019 02:10:59 +0000 (19:10 -0700)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
am:
007bb68bdb
Change-Id: Iee3057e1d9db477461e2d341c46bad1ef0377cb4
Shuzhen Wang [Wed, 24 Apr 2019 01:59:19 +0000 (18:59 -0700)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
am:
b9177522ff
Change-Id: Ib1da89bbfafa3f5c1231d14aa071f6e22c268da0
TreeHugger Robot [Wed, 24 Apr 2019 01:56:52 +0000 (01:56 +0000)]
Merge "Sharesheet - Scrolling UI adjustments" into qt-dev
Yao Chen [Wed, 24 Apr 2019 01:44:44 +0000 (18:44 -0700)]
Merge "Add encryption in incidentd." into qt-dev
am:
a35c2f1224
Change-Id: Ifb13a0ea562cdf1d5ada037c38b21094aaf7ad59
Steve Elliott [Wed, 24 Apr 2019 01:38:45 +0000 (18:38 -0700)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
am:
5acc240320
Change-Id: I8afee65f1cdf7e42c3eb2dba47d099b3ed3467f2
TreeHugger Robot [Wed, 24 Apr 2019 01:34:32 +0000 (01:34 +0000)]
Merge "Transition to bold when shrinking clock" into qt-dev
Hyundo Moon [Wed, 24 Apr 2019 01:31:39 +0000 (01:31 +0000)]
Merge "Make MediaController#getSessionInfo() as @NonNull" into qt-dev
Lucas Dupin [Wed, 24 Apr 2019 01:29:29 +0000 (18:29 -0700)]
Merge "Fix click and long click lock behavior" into qt-dev
am:
15ee32b208
Change-Id: I58636ae462e780e9914633507739cbd6f2cf6515
TreeHugger Robot [Wed, 24 Apr 2019 01:19:09 +0000 (01:19 +0000)]
Merge "Camera: Relax BURST_CAPTURE FPS requirements" into qt-dev
Anil Admal [Wed, 24 Apr 2019 01:02:02 +0000 (18:02 -0700)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
am:
5bcdc825ed
Change-Id: I12fd7c9fd636aaa6b9338b6eb82d1a44e5cf39fb
TreeHugger Robot [Wed, 24 Apr 2019 01:01:25 +0000 (01:01 +0000)]
Merge "Add encryption in incidentd." into qt-dev
TreeHugger Robot [Wed, 24 Apr 2019 00:51:06 +0000 (00:51 +0000)]
Merge "Initialize Global Actions Panel when one is available" into qt-dev
Lucas Dupin [Wed, 24 Apr 2019 00:41:45 +0000 (00:41 +0000)]
Merge "Fix click and long click lock behavior" into qt-dev
Marissa Wall [Wed, 24 Apr 2019 00:28:05 +0000 (17:28 -0700)]
Merge "ASurfaceControl: fix surface damage" into qt-dev
am:
9a205d9b12
Change-Id: Ied67a955418972f18e17885a2dbbb665b55fad3e
Mike Digman [Wed, 24 Apr 2019 00:21:26 +0000 (17:21 -0700)]
Merge "Sharesheet - update direct share loading animation" into qt-dev
am:
b8c3309a64
Change-Id: I08681e4844dd5c1e2ed652f9f5bbb8156e3c3f0e
Steven Wu [Wed, 24 Apr 2019 00:13:13 +0000 (17:13 -0700)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
am:
991aff4191
Change-Id: I23e99f892bee5fa797ba0cc7c4f0a5d2fc879411
Anil Admal [Wed, 24 Apr 2019 00:12:41 +0000 (00:12 +0000)]
Merge "Fix incorrect error log message in GnssVisibilityControl class" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 23:57:19 +0000 (23:57 +0000)]
Merge "ASurfaceControl: fix surface damage" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 23:48:41 +0000 (23:48 +0000)]
Merge "Sharesheet - update direct share loading animation" into qt-dev
Steven Wu [Tue, 23 Apr 2019 23:46:43 +0000 (23:46 +0000)]
Merge "Add logging for dozing on or off due to sensor wake up." into qt-dev
Dianne Hackborn [Tue, 23 Apr 2019 23:14:05 +0000 (16:14 -0700)]
Merge "Finish up Intent identifier implementation." into qt-dev
am:
3f5447d8ae
Change-Id: I85f95d1def8edf1c61a5f741ccd25ee717fbe985
Amin Shaikh [Tue, 23 Apr 2019 22:57:23 +0000 (15:57 -0700)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
am:
7f127b9c56
Change-Id: I9134d51489a4231892a818ada19a2f5d112cbb31
Dianne Hackborn [Tue, 23 Apr 2019 22:43:34 +0000 (22:43 +0000)]
Merge "Finish up Intent identifier implementation." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 22:39:55 +0000 (22:39 +0000)]
Merge "Add overlayable_icons_test to framework/SystemUI" into qt-dev
Yao Chen [Sun, 21 Apr 2019 21:34:30 +0000 (14:34 -0700)]
Add encryption in incidentd.
+ Sections which require encryption will be encryted on disk.
+ When the sections are requested by clients (e.g., permission controller, report assignee),
incidentd will decrypte the data.
+ For efficiency, encryption is done ONLY for sections that require encryption.
+ Use Keystore API for key management.
Bug:
131084614
Test: incidentd_test
Change-Id: I84d6b86807ba5bbde1051e847b2df6e79e6b5be5
Chenbo Feng [Tue, 23 Apr 2019 22:13:56 +0000 (15:13 -0700)]
[automerger skipped] Merge "Ask netd to swap stats map before reading" into qt-dev
am:
32b47dece4 -s ours
am skip reason: change_id I8fa37c26bec23ffca0b29b679e72ba1189f557f1 with SHA1
f729cb5fd6 is in history
Change-Id: I48dc5783885a97a0b0c975202c5878c058695524
Julia Reynolds [Tue, 23 Apr 2019 22:08:30 +0000 (15:08 -0700)]
Merge "Notification guts redesign" into qt-dev
am:
388f6726ea
Change-Id: I469344fe5a8f9a5487177eac7d1225d42c9ba7ed
Tyler Gunn [Tue, 23 Apr 2019 21:58:24 +0000 (14:58 -0700)]
Merge "Update API docs for country ISO APIs." am:
990053e552
am:
d60707b4ea
Change-Id: I570e639397645d121f5f9ef60fbd3bd97ae93d2f
TreeHugger Robot [Tue, 23 Apr 2019 21:57:09 +0000 (21:57 +0000)]
Merge "Ask netd to swap stats map before reading" into qt-dev
Tyler Gunn [Tue, 23 Apr 2019 21:49:19 +0000 (14:49 -0700)]
Merge "Update API docs for country ISO APIs."
am:
990053e552
Change-Id: Id27a49ca6f817be0c7b358e0cce562ee17dfff69
TreeHugger Robot [Tue, 23 Apr 2019 21:45:25 +0000 (21:45 +0000)]
Merge "Notification guts redesign" into qt-dev
Matthew Ng [Tue, 23 Apr 2019 21:43:39 +0000 (14:43 -0700)]
Merge "Removed the experimental code for gestural mode" into qt-dev
am:
04f13b4288
Change-Id: I47d96024a90b12b657ec09d72bed1a822e546c93
Tyler Gunn [Tue, 23 Apr 2019 21:40:12 +0000 (21:40 +0000)]
Merge "Update API docs for country ISO APIs."
Mady Mellor [Tue, 23 Apr 2019 21:34:37 +0000 (14:34 -0700)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
am:
aebf984d90
Change-Id: I3eb7cf64b3d3507927bf93c372ef803c5adc2717
Hyunyoung Song [Tue, 23 Apr 2019 21:21:00 +0000 (14:21 -0700)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
am:
c51ef32c2b
Change-Id: I4307434d56d5776bccb7ba977e3dde5883b55c8e
Jordan Liu [Tue, 23 Apr 2019 21:12:37 +0000 (14:12 -0700)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
am:
5a3afc8ce7
Change-Id: I7bea85b6f657a24b7d8b4292f83ef2f27d79da1e
TreeHugger Robot [Tue, 23 Apr 2019 21:11:28 +0000 (21:11 +0000)]
Merge "Removed the experimental code for gestural mode" into qt-dev
Marissa Wall [Tue, 23 Apr 2019 21:10:15 +0000 (14:10 -0700)]
ASurfaceControl: fix surface damage
There are two problems with surface control.
1) By merging the rects, the Region turned into 0,0,0,0 instead of
an or of the Rects.
2) In the case where an app intends to have a region of 0,0,0,0,
we should treat it the same as a region of 0,0,-1,-1.
Bug:
131175047
Test: ASurfaceControl
Change-Id: Ib2e3b90ac215e069d3d3c2eca81ff1013b4287aa
Mady Mellor [Tue, 23 Apr 2019 21:07:05 +0000 (21:07 +0000)]
Merge "Let NoMan know when something is no longer a bubble" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 21:03:36 +0000 (21:03 +0000)]
Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
Steve Elliott [Tue, 23 Apr 2019 20:59:06 +0000 (16:59 -0400)]
Initialize Global Actions Panel when one is available
This bug was accidentally introduced when the dialog initialization
logic was modified in ag/
6925312.
Test: manual
Bug:
129964234
Change-Id: I7a1a01c22e556b362bbb850be94464530e5a3a96
Matthew Ng [Tue, 23 Apr 2019 20:57:06 +0000 (13:57 -0700)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
am:
6db82f8965
Change-Id: I5e0a9ddb6fbaaf4bf61e43335ad24b01070bf19f
Pengquan Meng [Tue, 23 Apr 2019 20:51:29 +0000 (13:51 -0700)]
[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
Matt Pape [Tue, 23 Apr 2019 20:46:04 +0000 (13:46 -0700)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
am:
b4a49aa45b
Change-Id: Ic5700c6044fb1a1cd57803fe5269bf5428a39d07
Yin-Chia Yeh [Tue, 23 Apr 2019 20:40:33 +0000 (13:40 -0700)]
Merge "Camera: fix null pointer dereference" into qt-dev
am:
dc7de27113
Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8
Jordan Liu [Tue, 23 Apr 2019 20:40:09 +0000 (20:40 +0000)]
Merge "Do not populate SLOT_KEY with wrong slot info" into qt-dev
Pengquan Meng [Tue, 23 Apr 2019 20:39:26 +0000 (13:39 -0700)]
Merge "Add carrier display name related CarrierConfig"
am:
570f5dcae1
Change-Id: I8162117716296d3e707a192e4b61dc5fb3727fee
Howard Ro [Tue, 23 Apr 2019 20:34:43 +0000 (13:34 -0700)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
am:
14e7eb7108
Change-Id: I3e36cb4117118e0e62c2718d5e42144c210f93cd
Makoto Onuki [Tue, 23 Apr 2019 20:28:56 +0000 (13:28 -0700)]
Merge "pm set-home-activity waits until completion" into qt-dev
am:
ec41ca2aa7
Change-Id: I1b1ea6b9cdfdc7db542903debee4fc60cd26d425
Pengquan Meng [Tue, 23 Apr 2019 20:23:20 +0000 (20:23 +0000)]
Merge "Add carrier display name related CarrierConfig"
Nick Chalko [Tue, 23 Apr 2019 20:22:45 +0000 (13:22 -0700)]
Merge "Don't start an observer without an extcon device" into qt-dev
am:
9c505c5572
Change-Id: Ied990b9c3cf425a182242ea163565dc77af8769b
Seigo Nonaka [Tue, 23 Apr 2019 20:21:27 +0000 (13:21 -0700)]
Fix performance regression by fixing keys used in Typeface.Builder
The key used in Typeface.Builder is different from the key used in
findFromCache method. The problem is key generation in Typeface.Builder
since the key should be created from requested parameters not the actual
font styles.
Here is the raw performance differences on walleye-userdebug
android.graphics.perftests.TypefaceCreatePerfTest(us):
createFromResources: 248 -> 23: (-225, -90.7%)
Bug:
131167183
Test: manually collected perf test result.
Change-Id: Idea25095979707ac84b7f4bc1ede0c2daefd6127
Lucas Dupin [Tue, 23 Apr 2019 17:19:27 +0000 (10:19 -0700)]
Fix click and long click lock behavior
Accessibility clicks should unlock the phone and long presses should
disable trust agents.
Fixes:
131059420
Fixes:
130326686
Test: long press with trust agent
Test: double tap with TalkBack on lock screen
Test: double tap with TalkBack on bouncer
Change-Id: Ib2df54c540ebed0adf6c3cbcb82376c02e54d540
Mike Digman [Tue, 23 Apr 2019 20:13:17 +0000 (13:13 -0700)]
Merge "Sharesheet - make work profile badges render" into qt-dev
am:
aabebff4b8
Change-Id: Ia61d8663873fb2ab60a67167f7d4c66e9eac9c06
TreeHugger Robot [Tue, 23 Apr 2019 20:12:16 +0000 (20:12 +0000)]
Merge "Clean up left over prototype code in Navigation Bar" into qt-dev
Matt Pape [Tue, 23 Apr 2019 19:54:38 +0000 (19:54 +0000)]
Merge "Update settings to properties mapper to use multi property listener." into qt-dev
Robert Snoeberger [Mon, 22 Apr 2019 20:22:49 +0000 (16:22 -0400)]
Transition to bold when shrinking clock
Bug:
130223602
Test: visual - AOD to lock screen while playing music
Change-Id: Id03f93854bdb98a83664dc651cf1f30618f09176
Joel Galenson [Tue, 23 Apr 2019 19:47:52 +0000 (12:47 -0700)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
am:
5bac48f7c0
Change-Id: Ief691feb48e7e2e8b471d00c5caaf73f9a023365
Anil Admal [Thu, 18 Apr 2019 01:08:46 +0000 (18:08 -0700)]
Fix incorrect error log message in GnssVisibilityControl class
Fixes:
130763415
Test: Verified on a Pixel device.
Change-Id: I83c150df1e99e9fb264fdafd846be1afb33897ed
TreeHugger Robot [Tue, 23 Apr 2019 19:37:25 +0000 (19:37 +0000)]
Merge "Camera: fix null pointer dereference" into qt-dev
Howard Ro [Tue, 23 Apr 2019 19:36:25 +0000 (19:36 +0000)]
Merge "Revert "Add apex packages to uid_mapping"" into qt-dev
Makoto Onuki [Tue, 23 Apr 2019 19:36:08 +0000 (19:36 +0000)]
Merge "pm set-home-activity waits until completion" into qt-dev
Howard Ro [Tue, 23 Apr 2019 18:59:33 +0000 (18:59 +0000)]
Revert "Add apex packages to uid_mapping"
This reverts commit
67b1e54327e828a39a0706740d3898a8b561a81f.
Bug:
131167067
Reason for revert: b/
131167067
Change-Id: I9a6aa7121a83c50fc99954bd2485eccfb26d74f5
TreeHugger Robot [Tue, 23 Apr 2019 19:33:35 +0000 (19:33 +0000)]
Merge "Don't start an observer without an extcon device" into qt-dev
Sunny Goyal [Tue, 23 Apr 2019 19:30:13 +0000 (12:30 -0700)]
Merge "Adding callback when surface params are applied" into qt-dev
am:
8cb5228673
Change-Id: I399ae23877efc46ff02d43c1804440fd388cd127
Chenbo Feng [Tue, 23 Apr 2019 19:23:12 +0000 (12:23 -0700)]
[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
TreeHugger Robot [Tue, 23 Apr 2019 19:20:56 +0000 (19:20 +0000)]
Merge "Sharesheet - make work profile badges render" into qt-dev
Steven Wu [Tue, 23 Apr 2019 17:27:33 +0000 (13:27 -0400)]
Add logging for dozing on or off due to sensor wake up.
Test: manual
Bug:
117215619
Change-Id: Ic112fdcf05c934543698d9b6e3b98d56965c64e2
Michael Groover [Tue, 23 Apr 2019 19:17:36 +0000 (12:17 -0700)]
Merge "Add content description to sensors off icon in status bar" into qt-dev
am:
fa7a24ef8e
Change-Id: I7dde4ab81d058514b88a41f747473508074c9898
TreeHugger Robot [Tue, 23 Apr 2019 19:11:26 +0000 (19:11 +0000)]
Merge "Copy private resources into SettingsLib's ProgressBar." into qt-dev
Arc Wang [Tue, 23 Apr 2019 19:04:46 +0000 (12:04 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am:
831dc426f1
Change-Id: If2b162dd82a0d6c8fd48989ad6a31f0368534047
Shuo Qian [Tue, 23 Apr 2019 18:47:00 +0000 (11:47 -0700)]
[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
Android Build Merger (Role) [Tue, 23 Apr 2019 18:34:17 +0000 (18:34 +0000)]
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
Hyunyoung Song [Tue, 23 Apr 2019 18:24:55 +0000 (11:24 -0700)]
3->1 binder calls to OverlayManager for Navbar settings
Bug:
131112014
Test: builds
Change-Id: I2518ccd28493ef82793c9af192e72ee6521e6fd6
TreeHugger Robot [Tue, 23 Apr 2019 18:32:26 +0000 (18:32 +0000)]
Merge "Adding callback when surface params are applied" into qt-dev
Christopher Ferris [Tue, 23 Apr 2019 18:31:49 +0000 (11:31 -0700)]
[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
Greg Daniel [Tue, 23 Apr 2019 18:31:47 +0000 (11:31 -0700)]
Merge "Make sure to sync GPU after deleting memory in trimMemory." into qt-dev
am:
68406a2dd5
Change-Id: I67a9c2e15ec9b6691befec3cd8d439924fbfa5b4
Julia Reynolds [Fri, 19 Apr 2019 19:46:13 +0000 (15:46 -0400)]
Notification guts redesign
Test: atest
Fixes:
130766408
Fixes:
129453207
Bug:
127992400
Fixes:
129507783
Fixes:
130342795
Fixes:
130805969
Change-Id: I93984698c5380badb162774c818a1d040ccf9c1c
Amin Shaikh [Wed, 17 Apr 2019 19:24:42 +0000 (15:24 -0400)]
Add overlayable_icons_test to framework/SystemUI
This ensures that developers do not accidentally delete/rename overlayed icons
without updating overlayable_icons_text.xml and renaming overlayed assets.
Bug:
130438597
Bug:
128571899
Test: make tests
Change-Id: I54411b3a587c4798a190f49071d5a8aa399cd824
Mady Mellor [Thu, 18 Apr 2019 20:26:18 +0000 (13:26 -0700)]
Let NoMan know when something is no longer a bubble
This is needed for some of the notification group summary stuff to work.
More importantly, this is needed so that we can properly report to apps
if their notification is bubbled or not, e.g. if the user dismisses the
bubble & the notification is in the shade, that shouldn't be reported as
'FLAG_BUBBLE' as that notification is not actually being shown as a bubble.
* Adds onBubbleNotificationChanged to NotificationDelegate to pipe through
changes in bubble state, currently we only ever change it to 'false' but
this CL includes ability to flip it to 'true' (and also checks if the
notif should actually be able to bubble)
* Factors code that indicates something is approved to bubble into own
method
* Adds way to set BubbleMetadata on a notification (hidden !!)
Bug:
130250809
Test: atest NotificationManagerServiceTest
Change-Id: I8df4cc1231ed5d078ce4d50a70d2631f82fd2306
TreeHugger Robot [Tue, 23 Apr 2019 18:19:06 +0000 (18:19 +0000)]
Merge "Add a lock to protect persistent stats snapshot" into qt-dev
Jordan Liu [Mon, 22 Apr 2019 20:58:02 +0000 (13:58 -0700)]
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
21c3aeb49de064b011a452143f99b623acb94786)
Christopher Ferris [Tue, 23 Apr 2019 18:03:08 +0000 (11:03 -0700)]
Merge "Move to android_mallopt for malloc debug calls."
am:
aba4de21e0
Change-Id: Ibd755a60e862ff6db869bc412145d0058b9f7d41
Android Build Merger (Role) [Tue, 23 Apr 2019 18:00:43 +0000 (18:00 +0000)]
Merge "Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev am:
65cf57bf6c" into qt-dev-plus-aosp
Santos Cordon [Tue, 23 Apr 2019 17:59:51 +0000 (10:59 -0700)]
Merge "Add delay to power-button power-off after gesture wakeup." into qt-dev
am:
65cf57bf6c
Change-Id: I063e124f45cf7d55d04217ad1123db9ce9b14bf0
TreeHugger Robot [Tue, 23 Apr 2019 17:56:46 +0000 (17:56 +0000)]
Merge "Add content description to sensors off icon in status bar" into qt-dev
Android Build Merger (Role) [Tue, 23 Apr 2019 17:52:29 +0000 (17:52 +0000)]
Merge "Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev am:
aeb929a3f9" into qt-dev-plus-aosp
Fabian Kozynski [Tue, 23 Apr 2019 17:52:05 +0000 (10:52 -0700)]
Merge "Remove allocation from HeaderTileLayout#onLayout" into qt-dev
am:
aeb929a3f9
Change-Id: I3d4e3f1684ac08df8a2ea01273e3cf30cb3cb688
Android Build Merger (Role) [Tue, 23 Apr 2019 17:47:27 +0000 (17:47 +0000)]
Merge "Merge "Add ID field to the Callback" into qt-dev am:
14d351d41b" into qt-dev-plus-aosp
Lucas Dupin [Tue, 23 Apr 2019 17:47:05 +0000 (10:47 -0700)]
Merge "Add ID field to the Callback" into qt-dev
am:
14d351d41b
Change-Id: Icb0cab0607d98b40420bd52a3b3ff8c5bb48fec6
Christopher Ferris [Tue, 23 Apr 2019 17:45:01 +0000 (17:45 +0000)]
Merge "Move to android_mallopt for malloc debug calls."
OSDN Git Service
