OSDN Git Service
Yoshinori Hirano [Fri, 26 May 2017 16:40:39 +0000 (16:40 +0000)]
Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev am:
dc23c5e809
am:
0a5d096384
Change-Id: I595e06692d61a4f8961254d6a2bddc5cc17b082a
Julia Reynolds [Fri, 26 May 2017 16:38:26 +0000 (16:38 +0000)]
Merge "Send notification state event more frequently" into oc-dev am:
13cbd65608
am:
fb938ee79f
Change-Id: Iaa841201651eb90c691512c3919d38272e0d2a4c
Tenghui Zhu [Fri, 26 May 2017 16:32:10 +0000 (16:32 +0000)]
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev am:
36d6a985cd
am:
246bf5cb9b
Change-Id: I0ef7196cdb87d40be15adff868ca4fcc17addd60
Yoshinori Hirano [Fri, 26 May 2017 16:31:00 +0000 (16:31 +0000)]
Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev
am:
dc23c5e809
Change-Id: Ib7611306c6117754759af2b07e21f9cd26610173
Julia Reynolds [Fri, 26 May 2017 16:28:37 +0000 (16:28 +0000)]
Merge "Send notification state event more frequently" into oc-dev
am:
13cbd65608
Change-Id: I1776c7a7f3a4e221efbb4abde723873802deddf5
Tenghui Zhu [Fri, 26 May 2017 16:22:09 +0000 (16:22 +0000)]
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
am:
36d6a985cd
Change-Id: I53422934c6bf84033fdfff94c5eda79275e91b3a
TreeHugger Robot [Fri, 26 May 2017 16:20:45 +0000 (16:20 +0000)]
Merge "Collapse QS panel forcibly after dismissing Keyguard" into oc-dev
Soonil Nagarkar [Fri, 26 May 2017 16:20:50 +0000 (16:20 +0000)]
Merge "Properly battery blame throttled location requests" into oc-dev am:
68e341934b
am:
1300092b9a
Change-Id: I2153ca7f4abbc1f2689a3e39cb21ce6945685a49
TreeHugger Robot [Fri, 26 May 2017 16:19:18 +0000 (16:19 +0000)]
Merge "Send notification state event more frequently" into oc-dev
Soonil Nagarkar [Fri, 26 May 2017 16:12:28 +0000 (16:12 +0000)]
Merge "Properly battery blame throttled location requests" into oc-dev
am:
68e341934b
Change-Id: Iad757080d2aafc738171e9b04d03581474a63142
Tenghui Zhu [Fri, 26 May 2017 16:10:19 +0000 (16:10 +0000)]
Merge "Create a new drawable after caching the DrawableContainer" into oc-dev
Soonil Nagarkar [Fri, 26 May 2017 16:05:09 +0000 (16:05 +0000)]
Merge "Properly battery blame throttled location requests" into oc-dev
Jason Monk [Fri, 26 May 2017 15:44:32 +0000 (15:44 +0000)]
Merge "Fix RTL for SignalDrawable" into oc-dev am:
482da48066
am:
e5376996db
Change-Id: Idd310a696f2bd24aecdb3bf45266cbde0d4c9ef4
TreeHugger Robot [Fri, 26 May 2017 15:39:01 +0000 (15:39 +0000)]
Merge "don't need custom shader to track ref-counts"
Jason Monk [Fri, 26 May 2017 15:38:00 +0000 (15:38 +0000)]
Merge "Fix RTL for SignalDrawable" into oc-dev
am:
482da48066
Change-Id: I71d5e632bac18e5fad2a49321373e0ee01814678
TreeHugger Robot [Fri, 26 May 2017 15:30:18 +0000 (15:30 +0000)]
Merge "Fix RTL for SignalDrawable" into oc-dev
Felipe Leme [Fri, 26 May 2017 15:21:21 +0000 (15:21 +0000)]
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev am:
25ae29dfd5
am:
7dca2f6c74
Change-Id: Id3c55fac5286f9c77d09698711ca9467a3c43bae
Felipe Leme [Fri, 26 May 2017 15:15:50 +0000 (15:15 +0000)]
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
am:
25ae29dfd5
Change-Id: If14315daa807243828d0c386638fad38811d99e0
Mady Mellor [Fri, 26 May 2017 15:13:59 +0000 (15:13 +0000)]
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev am:
70739fb812
am:
2cd3e9c500
Change-Id: I393a87e48487ec51fc563cc1cb9f50d604970dc0
Adrian Roos [Fri, 26 May 2017 15:11:02 +0000 (15:11 +0000)]
Merge "AOD: Fix AOD background bug" into oc-dev am:
b8b748b7e6
am:
89255babb6
Change-Id: I80780c2145646db9ff2ce53c7a9126dcb570c9fb
TreeHugger Robot [Fri, 26 May 2017 15:08:14 +0000 (15:08 +0000)]
Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev
Julia Reynolds [Fri, 26 May 2017 15:02:28 +0000 (15:02 +0000)]
Merge "Allow some system notifications to be blocked." into oc-dev am:
3a2ac3e11b
am:
a98bdea2c5
Change-Id: Iec706994f0c7af34ba38b01fffaccdf6ee1bbe84
Mady Mellor [Fri, 26 May 2017 15:00:07 +0000 (15:00 +0000)]
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev
am:
70739fb812
Change-Id: Ie2014ee92ec3fb629801b18465ec42c36b6e2283
Adrian Roos [Fri, 26 May 2017 14:57:30 +0000 (14:57 +0000)]
Merge "AOD: Fix AOD background bug" into oc-dev
am:
b8b748b7e6
Change-Id: I3026455c7460c24433d905fce63a4018a0c14271
Julia Reynolds [Fri, 26 May 2017 14:53:53 +0000 (14:53 +0000)]
Merge "Allow some system notifications to be blocked." into oc-dev
am:
3a2ac3e11b
Change-Id: I356dcf376002d95238509235389d260e179fea26
Mady Mellor [Fri, 26 May 2017 14:53:48 +0000 (14:53 +0000)]
Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev am:
03a243889c
am:
8da8f55295
Change-Id: I2e117f71446b88956621d64ac9a977675b16370c
Mady Mellor [Fri, 26 May 2017 14:47:04 +0000 (14:47 +0000)]
Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev
am:
03a243889c
Change-Id: Iab86219c92978c4c37eaafd95800392d5b28bcf5
TreeHugger Robot [Fri, 26 May 2017 14:40:21 +0000 (14:40 +0000)]
Merge "Check for false touches when determining if the notif menu should be shown" into oc-dev
TreeHugger Robot [Fri, 26 May 2017 14:39:46 +0000 (14:39 +0000)]
Merge "AOD: Fix AOD background bug" into oc-dev
Julia Reynolds [Fri, 26 May 2017 14:39:26 +0000 (14:39 +0000)]
Merge "Allow some system notifications to be blocked." into oc-dev
TreeHugger Robot [Fri, 26 May 2017 14:37:17 +0000 (14:37 +0000)]
Merge "Add 2 hours as an option for snoozing, update default to 1 hour" into oc-dev
Yoshinori Hirano [Fri, 14 Apr 2017 02:29:38 +0000 (11:29 +0900)]
Collapse QS panel forcibly after dismissing Keyguard
The Quick Settings panel is not collapsed when the screen lock is
unlocked by using TileService APIs (unlockAndRun() and
startActivityAndCollapse()).
To fix this issue, the QS panel should be collapsed forcibly when
startActivityAndCollapse() is called.
Bug:
38252721
Test: manual - install an app which calls startActivityAndCollapse()
inside the runnable passed to unlockAndRun().
Author: Yuta Yamada <yuta.x.yamada@sonymobile.com>
Change-Id: I82d1df368d5024283f58ee5cc2d42559aac28467
Mike Reed [Fri, 26 May 2017 13:12:46 +0000 (09:12 -0400)]
don't need custom shader to track ref-counts
Test: hwui_unit_tests
Change-Id: Ibe67a86489e0e65251e3c0a4ddc2f72bf528f8b5
Jason Monk [Thu, 25 May 2017 20:11:52 +0000 (16:11 -0400)]
Fix RTL for SignalDrawable
Test: visual
Change-Id: I685125dff96829159d78983ad4b7c7f91d095c5c
Fixes:
38487767
Tony Mak [Fri, 26 May 2017 13:12:48 +0000 (13:12 +0000)]
Merge "Remove the old version of setAffiliationIds" into oc-dev am:
8d902a9e28
am:
754f6e22b0
Change-Id: I95a4b13ed76b6ce38c50047c9c6c923bf2ef7778
Tony Mak [Fri, 26 May 2017 13:06:23 +0000 (13:06 +0000)]
Merge "Remove the old version of setAffiliationIds" into oc-dev
am:
8d902a9e28
Change-Id: I219958d5f9d74845b0ec03f88903ea6b9ec345c6
TreeHugger Robot [Fri, 26 May 2017 13:00:35 +0000 (13:00 +0000)]
Merge "Remove the old version of setAffiliationIds" into oc-dev
Erik Kline [Fri, 26 May 2017 10:35:34 +0000 (10:35 +0000)]
Merge "Support registration of offload control callbacks." am:
7ee96625c2 am:
66cc06c2c7 am:
96c6d201f4
am:
aa75fc4ec9
Change-Id: I38ed30ae4fb8f850f65283b43420c6e625677ca8
Erik Kline [Fri, 26 May 2017 10:29:13 +0000 (10:29 +0000)]
Merge "Support registration of offload control callbacks." am:
7ee96625c2 am:
66cc06c2c7
am:
96c6d201f4
Change-Id: Ie3c4b0929ccf311b4f02fffe0908571cbbb7d772
Erik Kline [Fri, 26 May 2017 10:22:33 +0000 (10:22 +0000)]
Merge "Support registration of offload control callbacks." am:
7ee96625c2
am:
66cc06c2c7
Change-Id: Ieab0ae324ccf8ddfea02adfe647407df6c12b945
Nicolas Geoffray [Fri, 26 May 2017 10:20:39 +0000 (10:20 +0000)]
Merge "resolve merge conflicts of
255b69aca02f to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
b118505ef0
Change-Id: I6e9963188b487de4e76dc0d17d56b53050fd3745
Nicolas Geoffray [Fri, 26 May 2017 10:17:05 +0000 (10:17 +0000)]
Merge "resolve merge conflicts of
255b69aca02f to oc-dev-plus-aosp" into oc-dev-plus-aosp
Erik Kline [Fri, 26 May 2017 10:16:26 +0000 (10:16 +0000)]
Merge "Support registration of offload control callbacks."
am:
7ee96625c2
Change-Id: Ica4f51762b577e3868e87622df3963cd89daacae
Treehugger Robot [Fri, 26 May 2017 10:07:25 +0000 (10:07 +0000)]
Merge "Support registration of offload control callbacks."
Nicolas Geoffray [Fri, 26 May 2017 08:47:18 +0000 (09:47 +0100)]
resolve merge conflicts of
255b69aca02f to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9caf7542f11b0b322da063a5a08140384eba0ce0
Erik Kline [Fri, 26 May 2017 10:01:30 +0000 (10:01 +0000)]
Merge "WifiManager: add iface name and mode labels" into oc-dev am:
dfd185c62f
am:
3e737d1cf0
Change-Id: Ieff7af7c1ac2113b8044c16a01cad0f96cb70158
Erik Kline [Fri, 26 May 2017 09:55:29 +0000 (09:55 +0000)]
Merge "WifiManager: add iface name and mode labels" into oc-dev
am:
dfd185c62f
Change-Id: I67f82525b5c0fa5b81235311988c9b186d16077a
TreeHugger Robot [Fri, 26 May 2017 09:51:36 +0000 (09:51 +0000)]
Merge "Backup / restore additional lock screen settings"
Erik Kline [Fri, 26 May 2017 09:49:20 +0000 (09:49 +0000)]
Merge "WifiManager: add iface name and mode labels" into oc-dev
Nicolas Geoffray [Fri, 26 May 2017 08:13:49 +0000 (08:13 +0000)]
Merge "Pass bootComplete to dexopt." am:
18c3201986
am:
1e35b7b5bc
Change-Id: Id4633d3729c8532d901b33bb6720d8f34df1e6e9
Nicolas Geoffray [Fri, 26 May 2017 08:07:58 +0000 (08:07 +0000)]
Merge "Pass bootComplete to dexopt."
am:
18c3201986
Change-Id: I5d73692a887ef8f3fff888c310f9969d79ada970
Nicolas Geoffray [Fri, 26 May 2017 08:00:40 +0000 (08:00 +0000)]
Merge "Pass bootComplete to dexopt."
Erik Kline [Tue, 25 Apr 2017 10:19:59 +0000 (19:19 +0900)]
Support registration of offload control callbacks.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
32163131
Bug:
34361337
Change-Id: I054cdf6a277c77e4cbf5c81145446a9be1c5fe39
TreeHugger Robot [Fri, 26 May 2017 07:26:44 +0000 (07:26 +0000)]
Merge "MathUtils.map fix"
Sundeep Ghuman [Fri, 26 May 2017 03:01:42 +0000 (03:01 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev am:
04b5a63006
am:
3bb97f1b9b
Change-Id: I5bbd8026696ebaf6dcd24d19a8544d83734e001a
Sundeep Ghuman [Fri, 26 May 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
am:
04b5a63006
Change-Id: I3827885f89229f3063dd96ecaab9400e4579350b
TreeHugger Robot [Fri, 26 May 2017 02:47:51 +0000 (02:47 +0000)]
Merge "Add extra debug logging to WifiTracker." into oc-dev
Dianne Hackborn [Fri, 26 May 2017 01:50:19 +0000 (01:50 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev am:
e2975af2d3
am:
97dc2db3da
Change-Id: I9ff271cbd12303e5ffad3797886db14b20cc750f
Makoto Onuki [Fri, 26 May 2017 01:48:27 +0000 (01:48 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev am:
58f6f428fc
am:
a629afb05e
Change-Id: Icaa2e4c459a68dd6d667c81a5762554391cd233f
Ian Lake [Fri, 26 May 2017 01:43:09 +0000 (01:43 +0000)]
Merge "Relayout when base inner insets change" into oc-dev am:
7f874db5aa
am:
82624f130b
Change-Id: I1bb3642d57f7cbce3813ebb6ae131cad544fb674
Adam Powell [Fri, 26 May 2017 01:41:16 +0000 (01:41 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev am:
05d64e8b72
am:
f7a9adec31
Change-Id: I81eef839315a64d5a4c9cee84289f14493abd988
Dianne Hackborn [Fri, 26 May 2017 01:39:51 +0000 (01:39 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
am:
e2975af2d3
Change-Id: I431753261cfab677935a65548d235585c19ed565
Makoto Onuki [Fri, 26 May 2017 01:37:50 +0000 (01:37 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
am:
58f6f428fc
Change-Id: I108e9cc771457bb537d2857cde8f96607dbb0a8f
Suprabh Shukla [Fri, 26 May 2017 01:31:25 +0000 (01:31 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev am:
db6caa5841
am:
ee6f729f53
Change-Id: Ibe0cdf35cc21d7e6a0f20925ebcc2ce336f943f3
Ian Lake [Fri, 26 May 2017 01:31:10 +0000 (01:31 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
am:
7f874db5aa
Change-Id: I91bc90559f462d622133a018b1217eae10b6e11b
Adam Powell [Fri, 26 May 2017 01:28:41 +0000 (01:28 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
am:
05d64e8b72
Change-Id: I3cbf8fbdc9a54f1d47c1ab4c86eaf3f1850f468f
Jeff Sharkey [Fri, 26 May 2017 01:22:43 +0000 (01:22 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev am:
a6b7e0a679
am:
02315ed73d
Change-Id: If5391cac47775031d05bab87b0effa8e2742230a
Suprabh Shukla [Fri, 26 May 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
am:
db6caa5841
Change-Id: I00ea2d375c9543f26d0489939183b612942b1b46
Bryce Lee [Fri, 26 May 2017 01:15:54 +0000 (01:15 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev am:
aa051df3b6
am:
e07ceaf979
Change-Id: I574c0c30847f541c136ab377a9ea87e3d51577fb
TreeHugger Robot [Fri, 26 May 2017 01:12:13 +0000 (01:12 +0000)]
Merge "Fix issue #
62103358: ProcessRecord dump formatting problem" into oc-dev
Lorenzo Colitti [Fri, 26 May 2017 01:10:24 +0000 (01:10 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
am:
5fcfca0cba -s ours
Change-Id: Ia18a65bca3874b030ff4d5f97e11865a1f42f18a
Jeff Sharkey [Fri, 26 May 2017 01:09:53 +0000 (01:09 +0000)]
Merge "Offer listener to observe StrictMode violations." into oc-dev
am:
a6b7e0a679
Change-Id: I1610373c91aa4fc2a60732c51145b585b6372729
Bryce Lee [Fri, 26 May 2017 01:05:20 +0000 (01:05 +0000)]
Merge "Update ActivityStack#removeActivityFromHistoryLocked documentation." into oc-dev
am:
aa051df3b6
Change-Id: I4a8e9eb6452a40acdb0e9fc3a6a6db4908062b8b
Hugo Benichi [Fri, 26 May 2017 01:04:44 +0000 (01:04 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a am:
ae278410f5
am:
6923028613
Change-Id: Id592d287a92c89320a682d660792b9b6c67e7563
Android Build Merger (Role) [Fri, 26 May 2017 01:02:21 +0000 (01:02 +0000)]
Merge changes from topic 'am-
d53708499f7e48cdb8a7bb84c3076b88' into oc-dev-plus-aosp
* changes:
Merge changes from topic 'multinetwork_vndk' into oc-dev am:
cffee96a16
Move libandroid_net from Android.mk to Android.bp. am:
addb296226 -s ours
Lorenzo Colitti [Fri, 26 May 2017 01:01:21 +0000 (01:01 +0000)]
Merge changes from topic 'multinetwork_vndk' into oc-dev
am:
cffee96a16
Change-Id: I91cac262cdb6af6e441c4750636ec28a97f2ad1a
Lorenzo Colitti [Fri, 26 May 2017 00:59:52 +0000 (00:59 +0000)]
Move libandroid_net from Android.mk to Android.bp.
am:
addb296226 -s ours
Change-Id: Ie5c94188dfe3ea99a0ef3747c8b359c32e6176f0
Hugo Benichi [Fri, 26 May 2017 00:58:27 +0000 (00:58 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b am:
41a57af66a
am:
ae278410f5
Change-Id: I4fa34b647e7b2408d4493cfb148ae7d8c24bd6e8
Hugo Benichi [Fri, 26 May 2017 00:51:23 +0000 (00:51 +0000)]
Merge changes If4deb106,Ib25d7658 am:
0388f0e47b
am:
41a57af66a
Change-Id: Ieea1398319d8235e823464239d233bf6f528126d
TreeHugger Robot [Fri, 26 May 2017 00:45:38 +0000 (00:45 +0000)]
Merge "SelectionActionModeHelper should use target view's thread" into oc-dev
Sundeep Ghuman [Thu, 11 May 2017 00:45:13 +0000 (17:45 -0700)]
Add extra debug logging to WifiTracker.
Bug: b/
38212080
Test: NA
Change-Id: I1f5d1a1d43a1dd4d9ce2235d3a53d043d4e2120d
Hugo Benichi [Fri, 26 May 2017 00:43:06 +0000 (00:43 +0000)]
Merge changes If4deb106,Ib25d7658
am:
0388f0e47b
Change-Id: Id10b2a80388aff2307cefd95ffb5f2b4df5fbdc3
Hugo Benichi [Fri, 26 May 2017 00:34:03 +0000 (00:34 +0000)]
Merge changes If4deb106,Ib25d7658
* changes:
NsdService: do not use ContentResolver directly
@Ignore ConnectivityServiceTest#testRequestBenchmark
Android Build Merger (Role) [Thu, 25 May 2017 23:53:05 +0000 (23:53 +0000)]
Merge "Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp am:
fa5f8fa8a8"
Hyunyoung Song [Thu, 25 May 2017 23:52:25 +0000 (23:52 +0000)]
Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp
am:
fa5f8fa8a8
Change-Id: I11d97f6c553882c0fb2423c1a62ee540378fcd25
Android Build Merger (Role) [Thu, 25 May 2017 23:51:43 +0000 (23:51 +0000)]
Merge "Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp am:
f5fb04573b"
Brad Ebinger [Thu, 25 May 2017 23:50:59 +0000 (23:50 +0000)]
Merge "Merge "Add IMEI_NOT_ACCEPTED error code for IMS" am:
25ce41cf4c am:
be34238840 am:
689edc736f" into oc-dev-plus-aosp
am:
f5fb04573b
Change-Id: I3447422054e0f563e9314686c1638c43e7df296e
Android Build Merger (Role) [Thu, 25 May 2017 23:50:28 +0000 (23:50 +0000)]
Merge "Merge "Force a light to be set for the first time" into oc-dev am:
9ddb0f8691 -s ours am:
bf7443156d -s ours"
Oleksiy Avramchenko [Thu, 25 May 2017 23:49:46 +0000 (23:49 +0000)]
Merge "Force a light to be set for the first time" into oc-dev am:
9ddb0f8691 -s ours
am:
bf7443156d -s ours
Change-Id: I770eabd9e59158a984581d1e9ae14b9bf02adfd5
Android Build Merger (Role) [Thu, 25 May 2017 23:49:16 +0000 (23:49 +0000)]
Merge "Merge "Fixed memory leak with the inflater" into oc-dev am:
3d5fd7a959 am:
9cd34aa978"
Anthony Chen [Thu, 25 May 2017 23:48:40 +0000 (23:48 +0000)]
Merge "Allow notification actions to be configured."
Selim Cinek [Thu, 25 May 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Fixed memory leak with the inflater" into oc-dev am:
3d5fd7a959
am:
9cd34aa978
Change-Id: I8466a554dbe03eb83f8f737ff76b159dde0fc532
Chet Haase [Thu, 25 May 2017 23:43:20 +0000 (23:43 +0000)]
Merge "Fix and clarify behavior of vertical/horizontal attributes" into oc-dev am:
68311f8712
am:
4b35637a4a
Change-Id: If37d42fffcd17cec5e00f92c8a24215cc5425751
Selim Cinek [Thu, 25 May 2017 23:40:28 +0000 (23:40 +0000)]
Merge "Fixed an issue when inflating too many notifications" into oc-dev am:
3a6f2a30ce
am:
d68026a77f
Change-Id: I6200bed8201730d2c26e4882277e3632558c403d
Chad Brubaker [Thu, 25 May 2017 23:36:50 +0000 (23:36 +0000)]
Merge "Handle install time ephemeral permissions" into oc-dev am:
dc89202d1a
am:
32b9061d2c
Change-Id: Ie6072d3704e9bdecbc4b55c93e3aca129c31e620
Jason Monk [Thu, 25 May 2017 23:34:27 +0000 (23:34 +0000)]
Merge "Add test to verify all sysui tests extend the right stuff" into oc-dev am:
34b64f2559
am:
dd7ab998fd -s ours
Change-Id: I9b4bea605ac491e9d8d577cc1fdf17a8957c9a8d
TreeHugger Robot [Thu, 25 May 2017 23:25:43 +0000 (23:25 +0000)]
Merge "Relayout when base inner insets change" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:19:51 +0000 (23:19 +0000)]
Merge "Port Ic9d9d65c66325904c95ab3966bdcc16e7668278b to oc-dev" into oc-dev
TreeHugger Robot [Thu, 25 May 2017 23:17:43 +0000 (23:17 +0000)]
Merge "Removing unused SecureTouchListener" into oc-dev
Android Build Merger (Role) [Thu, 25 May 2017 23:13:04 +0000 (23:13 +0000)]
Merge "Merge "Fix safezone and getAlpha b/
38361276 Test: frameworks/base/core/tests/coretests/src/android/graphics/drawable/IconTest.java" into oc-dev am:
cca181bfbb" into oc-dev-plus-aosp