Jayachandran Chinnakkannu
332322ec00
Merge "Add a new intent ACTION_MMSSMS_DATABASE_LOST"
2018-10-19 05:20:06 +00:00
Tim Murray
35ab331306
[automerger skipped] Merge "hwui: purge malloc pages on bitmap destruction" into pi-dev-plus-aosp
...
am: 248c5abce7 -s ours
Change-Id: I48259593a8383854f5124111c2651001b72b5320
2018-10-18 20:08:07 -07:00
Tim Murray
a726defe14
[automerger skipped] hwui: purge malloc pages on bitmap destruction
...
am: 64fee6148b -s ours
Change-Id: Id8706b628ee89eee82f54a78d967c26d57957f89
2018-10-18 20:02:26 -07:00
Tim Murray
45e7278331
[automerger skipped] wm: recycle bitmaps immediately in TaskSnapshotPersister
...
am: 59be089837 -s ours
Change-Id: I6c33a21063de875fdf7eaef397e4f375aa356bf6
2018-10-18 19:57:09 -07:00
Tim Murray
248c5abce7
Merge "hwui: purge malloc pages on bitmap destruction" into pi-dev-plus-aosp
2018-10-19 02:41:49 +00:00
Tim Murray
59be089837
wm: recycle bitmaps immediately in TaskSnapshotPersister
...
Bitmap created in TaskSnapshotPersister are very short lived and
shouldn't be left around in the Java heap.
Test: boot, switch apps, works
bug 117795621
Exempt-From-Owner-Approval: approved in another branch
Merged-in: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
2018-10-19 02:40:31 +00:00
Tim Murray
36eff60d34
Merge changes from topic "malloc-purge-master"
...
* changes:
hwui: purge malloc pages on bitmap destruction
wm: recycle bitmaps immediately in TaskSnapshotPersister
2018-10-19 02:31:14 +00:00
Tim Murray
e0b5e846f8
hwui: purge malloc pages on bitmap destruction
...
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.
Test: boots and works
bug 117795621
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-19 02:31:07 +00:00
Tim Murray
af85392b51
wm: recycle bitmaps immediately in TaskSnapshotPersister
...
Bitmap created in TaskSnapshotPersister are very short lived and
shouldn't be left around in the Java heap.
Test: boot, switch apps, works
bug 117795621
Exempt-From-Owner-Approval: approved in another branch
Change-Id: I4b5e0db50c2b7adaa71cb0d22535c1b37c7523e8
2018-10-19 02:29:29 +00:00
TreeHugger Robot
1b32aa09c1
Merge "Revert "Revert "Remove obsolete AndroidTestCase"""
2018-10-19 02:22:46 +00:00
Tadashi G. Takaoka
4554207a95
Revert "Revert "Remove obsolete AndroidTestCase""
...
This reverts commit 1965af25f2 .
Reason for revert: the main cause has been fixed b/117880789.
Bug: 117924387
Change-Id: I32fcf72c9262d10364dfb1e31a6eacf69652be5f
2018-10-19 02:22:13 +00:00
Winson Chung
e80963daf9
Merge "Allow recents animation controller to control input consumer lifecycle"
2018-10-19 00:08:57 +00:00
Courtney Goeltzenleuchter
42bce33475
Merge "Update to EGL 1.5"
2018-10-18 23:33:45 +00:00
Tim Murray
64fee6148b
hwui: purge malloc pages on bitmap destruction
...
Immediately purge malloc pages on bitmap destruction. Bitmaps are often
big and can cause memory to stay high for much longer than it should.
Test: boots and works
bug 117795621
Merged-in: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
Change-Id: If2e8c5f1fc07039cf3dc3edcd3dc06861dbce1a1
2018-10-18 23:30:35 +00:00
Makoto Onuki
498cb3df20
Merge "Add timeout to AMS.getContentProviderImpl()"
2018-10-18 23:18:03 +00:00
TreeHugger Robot
2288590ec4
Merge "Fixes back button direction when toggling rtl and ltr"
2018-10-18 23:13:28 +00:00
TreeHugger Robot
a354de4c96
Merge "Clarify getMaxSecurityLevel in MediaDrm java doc"
2018-10-18 23:01:24 +00:00
Hall Liu
ddb5e19f52
Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66 am: 5bd6b4d570
...
am: 13d2b5f1ab
Change-Id: Idc591385a9b5af1fc9004a54388e376d05b1aa15
2018-10-18 15:54:06 -07:00
Brad Ebinger
dfe87a6d16
Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10 am: 8e5a756f9d
...
am: aa2e73d8a5
Change-Id: I12e15589ed079a100efd3a872eb60193951b4efa
2018-10-18 15:39:04 -07:00
Hall Liu
13d2b5f1ab
Merge "Add dynamic support for 4G/LTE/LTE+ icons" am: 0c9254ee66
...
am: 5bd6b4d570
Change-Id: Ib0c30a20063087de7e336d01675f83de0aa64c7d
2018-10-18 15:30:11 -07:00
Android Build Merger (Role)
cbf14558bd
Merge "Merge "CEC: Make TV try to dispatch the message first" am: aa3970209e am: bea3ddf9de am: cbcb5e586d"
2018-10-18 22:27:12 +00:00
Jeff Sharkey
40a11db103
Merge "Skip granting of legacy permissions."
2018-10-18 22:27:06 +00:00
Kyeongkab.Nam
1b00322819
Merge "CEC: Make TV try to dispatch the message first" am: aa3970209e am: bea3ddf9de
...
am: cbcb5e586d
Change-Id: I97f42c79446f5e963632764052435512cbcaee05
2018-10-18 15:26:46 -07:00
Brad Ebinger
aa2e73d8a5
Merge "Expose ImsExternalCallState constructor as @SystemApi" am: 4133a00a10
...
am: 8e5a756f9d
Change-Id: Icc899e3da0472a9409856e51d1bd8f02074431ad
2018-10-18 15:24:51 -07:00
Kyeongkab.Nam
ee867c12d8
Merge "Change handling logic in SystemAudioAutoInitiationAction" am: e31990f54c am: add89ebe40
...
am: dc903efb7d
Change-Id: I3b97ad8198b0ccef18dedd5399028b3a513e4f01
2018-10-18 15:20:00 -07:00
Varun Shah
84a7af440a
Merge "Improved idle processes killing logic."
2018-10-18 22:15:33 +00:00
David Brazdil
aa0d977f6f
Merge "Add entries to hidden api greylist" am: 7d044566c6 am: be42ec18df
...
am: 65240e8229
Change-Id: Ic085da7cd80379633706b890a320473974ac8e14
2018-10-18 15:12:06 -07:00
Kyeongkab.Nam
cbcb5e586d
Merge "CEC: Make TV try to dispatch the message first" am: aa3970209e
...
am: bea3ddf9de
Change-Id: Ia05bb1395ef854f03d3f4165fc3f0abf922407c8
2018-10-18 15:07:07 -07:00
Xiangyu/Malcolm Chen
0453359d7d
Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants" am: 1b59a1673a am: 325b3aea77
...
am: 57ddfce9ea
Change-Id: I88f3fddb264b512b20466e8f824b3dae93670b66
2018-10-18 15:04:00 -07:00
Kyeongkab.Nam
dc903efb7d
Merge "Change handling logic in SystemAudioAutoInitiationAction" am: e31990f54c
...
am: add89ebe40
Change-Id: If37e08f891639e6bb8c568bea4ca90dc6470d6bc
2018-10-18 15:01:57 -07:00
David Brazdil
65240e8229
Merge "Add entries to hidden api greylist" am: 7d044566c6
...
am: be42ec18df
Change-Id: I33b270876d603d19a752c5f3fabb44cebe4bf95f
2018-10-18 14:56:52 -07:00
Hall Liu
5bd6b4d570
Merge "Add dynamic support for 4G/LTE/LTE+ icons"
...
am: 0c9254ee66
Change-Id: Ie5841b4e86231517f724948389ff2b819d8245ad
2018-10-18 14:56:21 -07:00
Android Build Merger (Role)
48c404a28a
Merge "Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd am: c91b0fdfeb am: 4ee1409540"
2018-10-18 21:54:51 +00:00
weichinweng
5f86ce578c
Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd am: c91b0fdfeb
...
am: 4ee1409540
Change-Id: I62ae26865245023e7f28d2964d876031e6c19d07
2018-10-18 14:54:21 -07:00
Brad Ebinger
8e5a756f9d
Merge "Expose ImsExternalCallState constructor as @SystemApi"
...
am: 4133a00a10
Change-Id: Ic1245b146735f33ec679a83eb7dd228b4aeb3178
2018-10-18 14:52:24 -07:00
Android Build Merger (Role)
e52661858c
Merge "Merge "audio: apply volume upon hearing aid device connection" am: 7b9184bff4 am: 2dc797e211 am: bed29e9362"
2018-10-18 21:48:12 +00:00
Eric Laurent
72d1323eaf
Merge "audio: apply volume upon hearing aid device connection" am: 7b9184bff4 am: 2dc797e211
...
am: bed29e9362
Change-Id: I1c67fe12922d542d3fe0e68b5c7235a95419eb42
2018-10-18 14:47:21 -07:00
Shuo Qian
fc6a54b841
Merge "Fix current.txt error"
2018-10-18 21:45:06 +00:00
Xiangyu/Malcolm Chen
57ddfce9ea
Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants" am: 1b59a1673a
...
am: 325b3aea77
Change-Id: I810a6cfc2af1906fa7ae278a939e2ff3856714e0
2018-10-18 14:44:11 -07:00
Kyeongkab.Nam
bea3ddf9de
Merge "CEC: Make TV try to dispatch the message first"
...
am: aa3970209e
Change-Id: Ia5ecee02a2424d895f344a7c22f08d50bb076218
2018-10-18 14:41:48 -07:00
Kyeongkab.Nam
add89ebe40
Merge "Change handling logic in SystemAudioAutoInitiationAction"
...
am: e31990f54c
Change-Id: Ifbc111a3b01448f7eb35c4dc6b7ebb3be3331bfa
2018-10-18 14:38:41 -07:00
weichinweng
4ee1409540
Merge "AudioService: Add Hearing Aid Switch Control" am: f3b7821fbd
...
am: c91b0fdfeb
Change-Id: If26a9b0c561a8ba8da761aaba634d705e063f315
2018-10-18 14:38:10 -07:00
Eric Laurent
bed29e9362
Merge "audio: apply volume upon hearing aid device connection" am: 7b9184bff4
...
am: 2dc797e211
Change-Id: I02080eb4d223f01836f5fd5435e83e15243ee8bd
2018-10-18 14:33:48 -07:00
TreeHugger Robot
7dd9e171c2
Merge "metric activation and TTL."
2018-10-18 21:32:29 +00:00
TreeHugger Robot
e730fd646f
Merge "Fixes notification blocking from secure camera."
2018-10-18 21:30:34 +00:00
David Brazdil
be42ec18df
Merge "Add entries to hidden api greylist"
...
am: 7d044566c6
Change-Id: Id7966477ee57cd3a8d3b02c4772b6a572e3f5f1a
2018-10-18 14:25:12 -07:00
Xiangyu/Malcolm Chen
325b3aea77
Merge "Define EVENT_DEVICE_PROVISIONING_DATA_SETTING_CHANGE in DctConstants"
...
am: 1b59a1673a
Change-Id: I15c450d9ca7a71bfbde1ddd602e13473bede06b3
2018-10-18 14:21:29 -07:00
weichinweng
c91b0fdfeb
Merge "AudioService: Add Hearing Aid Switch Control"
...
am: f3b7821fbd
Change-Id: I6abbbc268a8c391e2d400e7a9811ea0e04362bfc
2018-10-18 14:18:06 -07:00
Eric Laurent
2dc797e211
Merge "audio: apply volume upon hearing aid device connection"
...
am: 7b9184bff4
Change-Id: Id79009433359321de2af226ca741aa912057e593
2018-10-18 14:14:59 -07:00
Cody Northrop
fdd0229da8
Merge "Find and load ANGLE rules, pass to libEGL"
2018-10-18 21:01:24 +00:00