OSDN Git Service
Bill Yi [Thu, 24 Aug 2017 14:38:05 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibd8f59fe4f495aed5b9d3e0b04353e93e9489ba1
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Sudheer Shanka [Wed, 23 Aug 2017 23:01:49 +0000 (23:01 +0000)]
Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am:
29091ec55f" into oc-mr1-dev-plus-aosp
am:
383551da86
Change-Id: I9303dbda0f4d82c161d8cddacc8d3a56ebe1d52c
Hall Liu [Wed, 23 Aug 2017 22:52:08 +0000 (22:52 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0 am:
aeb64f7f98 am:
070508ea7a
am:
e599803180
Change-Id: I88446f4080582fcfea1428c57166c1d8c9f822cd
Android Build Merger (Role) [Wed, 23 Aug 2017 22:45:42 +0000 (22:45 +0000)]
Merge "Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev am:
29091ec55f" into oc-mr1-dev-plus-aosp
Sudheer Shanka [Wed, 23 Aug 2017 22:38:49 +0000 (22:38 +0000)]
Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
am:
29091ec55f
Change-Id: I2540bd98007d8471758dfcbf365cab231594c52c
Hall Liu [Wed, 23 Aug 2017 22:34:22 +0000 (22:34 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0 am:
aeb64f7f98
am:
070508ea7a
Change-Id: I51a886a6d30bc4a13fd25fd5d96819353257b5f5
Sudheer Shanka [Wed, 23 Aug 2017 22:26:08 +0000 (22:26 +0000)]
Merge "Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e" into oc-mr1-dev
Hall Liu [Wed, 23 Aug 2017 22:22:48 +0000 (22:22 +0000)]
Merge "Embms adjustments for 7/28" am:
3f6a95e8b0
am:
aeb64f7f98
Change-Id: I88b9f6fb07b9e7e10bb375d2e8bef968da51c20c
Hall Liu [Wed, 23 Aug 2017 22:10:09 +0000 (22:10 +0000)]
Merge "Embms adjustments for 7/28"
am:
3f6a95e8b0
Change-Id: I925a0a894098071a3d092d953e4d545a58531a69
TreeHugger Robot [Wed, 23 Aug 2017 21:27:51 +0000 (21:27 +0000)]
Merge "AAPT2: Define intermediate compiled XML proto"
George Mount [Wed, 23 Aug 2017 21:18:14 +0000 (21:18 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev am:
230e025841
am:
2d3e8b8ddb
Change-Id: I8077587dfcfd160028635d4dd11c0438317febc3
George Mount [Wed, 23 Aug 2017 21:03:46 +0000 (21:03 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
am:
230e025841
Change-Id: I8dbb21476f7d38a37c8e5b5732b51255b0bcba14
Adrian Roos [Wed, 23 Aug 2017 21:02:04 +0000 (21:02 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev am:
e45c956f69
am:
f5c9bd16af
Change-Id: Id5ca4ac29e48b36f4dd1183a69b95b6146805569
George Mount [Wed, 23 Aug 2017 20:52:34 +0000 (20:52 +0000)]
Merge "Use hardware bitmap for shared element snapshots." into oc-mr1-dev
Adrian Roos [Wed, 23 Aug 2017 20:51:45 +0000 (20:51 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
am:
e45c956f69
Change-Id: Icb6e18a867302d85d877d9bf4a8d33836eac9539
George Mount [Tue, 22 Aug 2017 15:19:56 +0000 (08:19 -0700)]
Use hardware bitmap for shared element snapshots.
Bug:
64851247
Drawing to software bitmaps does not support many
features, most especially hardware bitmaps. This
changes the implementation to using hardware bitmaps
for View snapshots.
Also fixed broken TransitionTest discovered while
testing.
Test: I4ede02db67e578ea4a25069b683f1989c611e06c
Change-Id: I185bbfe1f789055c9efdba5297a74e481607afaf
TreeHugger Robot [Wed, 23 Aug 2017 20:40:42 +0000 (20:40 +0000)]
Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev
Tim Murray [Wed, 23 Aug 2017 20:38:49 +0000 (20:38 +0000)]
Merge "Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26 am:
2adfb7e4b0" into oc-mr1-dev-plus-aosp
am:
62169aa0db
Change-Id: Iaf9ce074e94b8216406064d33d7eab3fb06861cc
Tim Murray [Wed, 23 Aug 2017 20:31:34 +0000 (20:31 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26 am:
ecc48b8bf5
am:
6bd73ffc09
Change-Id: Ica991c35fdc2688ce2d35508828aabcccb580940
Android Build Merger (Role) [Wed, 23 Aug 2017 20:21:16 +0000 (20:21 +0000)]
Merge "Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26 am:
2adfb7e4b0" into oc-mr1-dev-plus-aosp
Hall Liu [Wed, 23 Aug 2017 20:18:15 +0000 (20:18 +0000)]
Merge "Embms adjustments for 7/28"
Tim Murray [Wed, 23 Aug 2017 20:17:12 +0000 (20:17 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26
am:
2adfb7e4b0
Change-Id: I413969f58e660243d1a07c2bbddfb4a05f85a57b
jackqdyulei [Wed, 23 Aug 2017 20:15:11 +0000 (20:15 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev am:
367838be4f
am:
ff1a4ecacf
Change-Id: Ic037573b2c7e4e761831a608045a1399eabaf4a1
Tim Murray [Wed, 23 Aug 2017 20:14:27 +0000 (20:14 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours am:
dd028e7c26
am:
ecc48b8bf5
Change-Id: Ibd21e8f9b87fca7ef66ad527cb857eaa17cdf380
jackqdyulei [Wed, 23 Aug 2017 20:01:40 +0000 (20:01 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev
am:
367838be4f
Change-Id: Ied709698c4f26958ecaadfd5511af814685df53c
Tim Murray [Wed, 23 Aug 2017 20:01:06 +0000 (20:01 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours
am:
dd028e7c26
Change-Id: I1bcc02adcc7b74d63e09db1251b13c90630ef7a9
Tim Murray [Wed, 23 Aug 2017 20:01:05 +0000 (20:01 +0000)]
Merge "power: throttle interaction hints" into oc-dev am:
78701217fd -s ours
am:
dd028e7c26
Change-Id: Ie7dae1e15d80fa422fed47efb21a5d388c5be3b2
Jason Monk [Wed, 23 Aug 2017 19:52:43 +0000 (19:52 +0000)]
Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev am:
45e8fe20de
am:
56f380cd47
Change-Id: Ib68e4189ee6490e1b41877a6e5c212063006b2ba
Tim Murray [Wed, 23 Aug 2017 19:48:14 +0000 (19:48 +0000)]
Merge "power: throttle interaction hints" into oc-dev
am:
78701217fd -s ours
Change-Id: I5135ddb75679ff6e4ffe5bb8daff97daf05deb34
TreeHugger Robot [Wed, 23 Aug 2017 19:38:38 +0000 (19:38 +0000)]
Merge "Remove string power_charging_duration_short" into oc-mr1-dev
Kevin Chyn [Wed, 23 Aug 2017 19:33:41 +0000 (19:33 +0000)]
Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev am:
1fee204686
am:
163e73455c
Change-Id: Ica7a566d83eec318c71e0f3470c8595169786a52
Jason Monk [Wed, 23 Aug 2017 19:30:37 +0000 (19:30 +0000)]
Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev
am:
45e8fe20de
Change-Id: Ic47deee56fc209b0230eab0358ff426f765735b3
TreeHugger Robot [Wed, 23 Aug 2017 19:25:47 +0000 (19:25 +0000)]
Merge "power: throttle interaction hints" into oc-dev
Kevin Chyn [Wed, 23 Aug 2017 19:23:11 +0000 (19:23 +0000)]
Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev
am:
1fee204686
Change-Id: I4a434ebd87377cf249274168f71d6eeb714cfe63
TreeHugger Robot [Wed, 23 Aug 2017 19:11:01 +0000 (19:11 +0000)]
Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 18:58:09 +0000 (18:58 +0000)]
Merge "Add null check when ActivityRecord is refetched" into oc-mr1-dev
Adam Lesinski [Thu, 10 Aug 2017 22:37:28 +0000 (15:37 -0700)]
AAPT2: Define intermediate compiled XML proto
This proto format is meant to encapsulate more information
that is specific to Android and allows for easier validation
and manipulation across tools.
Test: make aapt2_tests
Change-Id: I13bc34a460671fc0a36246be0d287a3d37d244d6
Andrii Kulian [Wed, 23 Aug 2017 18:47:03 +0000 (18:47 +0000)]
Merge "Track app visibility updates on the client" into oc-mr1-dev am:
0d008e3204
am:
0111667c9a
Change-Id: Icd38d427cb6b3339c99af8b56dcdb87c6aaabb76
Sudheer Shanka [Wed, 23 Aug 2017 18:29:23 +0000 (11:29 -0700)]
Change KernelUidCpuFreqTimeReader Slog.wtf to Slog.e
Bug:
63041570
Test: N/A
Change-Id: I2cb12f1b8f0333c4a000d601624dc95934cf9b90
Andrii Kulian [Wed, 23 Aug 2017 18:24:20 +0000 (18:24 +0000)]
Merge "Track app visibility updates on the client" into oc-mr1-dev
am:
0d008e3204
Change-Id: Iaa4ef63044a5e20b5886b47a33380c33d2668442
Andrii Kulian [Wed, 23 Aug 2017 18:06:50 +0000 (18:06 +0000)]
Merge "Track app visibility updates on the client" into oc-mr1-dev
Hall Liu [Thu, 27 Jul 2017 22:33:31 +0000 (15:33 -0700)]
Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo
Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
Adrian Roos [Wed, 23 Aug 2017 17:49:15 +0000 (17:49 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev am:
07168bf44b
am:
b32f14c2e9
Change-Id: I98f8eb4bd3a81e1d48b82c925dbf5cf5ac562de4
TreeHugger Robot [Wed, 23 Aug 2017 17:45:14 +0000 (17:45 +0000)]
Merge "Correct fontFamily attr docs to mention resources"
Hall Liu [Wed, 23 Aug 2017 17:28:36 +0000 (17:28 +0000)]
Merge "Embms API adjustments for 7/21" am:
489dcb7cca am:
488d3bf786 am:
7754e25694 am:
a7bb0ffc7d
am:
c04df54cfc
Change-Id: Ie23fae4840c7d944d43a6040d3bb09aa3ccd5b76
Adrian Roos [Wed, 23 Aug 2017 17:26:03 +0000 (17:26 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
am:
07168bf44b
Change-Id: Iaaf4c696269279b5ad3c2489a636450ead02f475
TreeHugger Robot [Wed, 23 Aug 2017 17:24:19 +0000 (17:24 +0000)]
Merge "Update DISALLOW_CONFIG_TETHERING javadoc"
Hall Liu [Wed, 23 Aug 2017 17:16:04 +0000 (17:16 +0000)]
Merge "Embms API adjustments for 7/21" am:
489dcb7cca am:
488d3bf786 am:
7754e25694
am:
a7bb0ffc7d
Change-Id: Iab7c397dba3fb446e0c03cd1bab0e82de8172577
TreeHugger Robot [Wed, 23 Aug 2017 17:12:27 +0000 (17:12 +0000)]
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
Hall Liu [Wed, 23 Aug 2017 17:05:57 +0000 (17:05 +0000)]
Merge "Embms API adjustments for 7/21" am:
489dcb7cca am:
488d3bf786
am:
7754e25694
Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc
Hall Liu [Wed, 23 Aug 2017 16:56:26 +0000 (16:56 +0000)]
Merge "Embms API adjustments for 7/21" am:
489dcb7cca
am:
488d3bf786
Change-Id: I03ca7bd2734b5410c37b23ba2e8d33d722ad7ebf
Hall Liu [Wed, 23 Aug 2017 16:44:01 +0000 (16:44 +0000)]
Merge "Embms API adjustments for 7/21"
am:
489dcb7cca
Change-Id: Ia0b3e9908878c2053c25753b8d393070c2c48a0e
Hall Liu [Wed, 23 Aug 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Embms API adjustments for 7/21"
Phil Weaver [Wed, 23 Aug 2017 16:37:47 +0000 (16:37 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev am:
4329f8ee97
am:
e65cac2069
Change-Id: I67c6d6aea491be0272f40bb1561a557c88ccb9d3
Phil Weaver [Wed, 23 Aug 2017 16:24:01 +0000 (16:24 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
am:
4329f8ee97
Change-Id: I0a17082c0e566fb7a4efea62545f1727328aed9d
Selim Cinek [Wed, 23 Aug 2017 16:23:40 +0000 (16:23 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev am:
60a09546c0
am:
0c8a132ea3
Change-Id: Ie7e15d7c4010c0e3cbf0081a1a4084767c83b1fa
Beverly Tai [Wed, 23 Aug 2017 16:14:39 +0000 (16:14 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev am:
f7964b1513
am:
32ab50bb99
Change-Id: I0f0dde5f886c1b9959782c4e48a6fda2e1030e76
Phil Weaver [Wed, 23 Aug 2017 16:14:02 +0000 (16:14 +0000)]
Merge "Check a11y enabled before sending events from PiP" into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 16:07:49 +0000 (16:07 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
am:
60a09546c0
Change-Id: If41351abbd54b19dbdcaecca01fe7104176f488b
TreeHugger Robot [Wed, 23 Aug 2017 16:07:04 +0000 (16:07 +0000)]
Merge "Update javadoc of UserManager#DISALLOW_ADJUST_VOLUME"
Beverly Tai [Wed, 23 Aug 2017 15:59:51 +0000 (15:59 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
am:
f7964b1513
Change-Id: I4f7cc636c3c1cf84de3963947730ac56147131aa
Selim Cinek [Wed, 23 Aug 2017 15:55:41 +0000 (15:55 +0000)]
Merge "Transforming all texts of decorated media custom views" into oc-mr1-dev
Beverly Tai [Wed, 23 Aug 2017 15:50:30 +0000 (15:50 +0000)]
Merge "Hides non-system overlays on USB debugging dialog." into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 15:30:54 +0000 (15:30 +0000)]
Merge "WebView: clarify docs for addJavascriptInterface"
Rubin Xu [Wed, 23 Aug 2017 14:48:12 +0000 (15:48 +0100)]
Update DISALLOW_CONFIG_TETHERING javadoc
We now force off tethering when DISALLOW_CONFIG_TETHERING is set.
Make this clear in the doc.
Bug:
27936525
Test: make -j docs
Change-Id: Ifd6f84f295bbce7b5bd6042a7f4f4be39190f6bc
Jason Monk [Wed, 23 Aug 2017 14:56:34 +0000 (10:56 -0400)]
Allow status_bar_height to be RRO controlled
Test: Boot device, see status bar
Bug:
64970608
Change-Id: I22e1131fbb98d89ce20e0862209d849ba3f16105
Adrian Roos [Tue, 22 Aug 2017 13:42:12 +0000 (15:42 +0200)]
AOD: Fix crash when AOD is stopped immediately after starting
Fixes an issue where the screen state was set after DozeService was already
destroyed, causing a crash.
Change-Id: I13ff590b62f905330ccb438692410e118b76c242
Fixes:
64907936
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
Wen ZHANG [Wed, 23 Aug 2017 13:27:02 +0000 (14:27 +0100)]
Update javadoc of UserManager#DISALLOW_ADJUST_VOLUME
Profile owners are not allowed setting this restriction until the N
release.
Test: No test as it only touches javadocs
Change-Id: I793e2c3b5270ee00e451551e68567e8995f31d1c
Jorim Jaggi [Wed, 23 Aug 2017 11:32:57 +0000 (11:32 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev am:
af6a558327
am:
4ebf25b833
Change-Id: I57cbbf6fb290fc49d09fb257ed9c10a2f2af4c25
Jorim Jaggi [Wed, 23 Aug 2017 11:23:29 +0000 (11:23 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev
am:
af6a558327
Change-Id: I7c33b554fc3ea8fa074afb0eb8a0631801208e61
Clara Bayarri [Wed, 23 Aug 2017 11:19:04 +0000 (12:19 +0100)]
Correct fontFamily attr docs to mention resources
Test: none
Change-Id: I8131d486779a340a331497f237ef7a3fc7420e94
Jorim Jaggi [Wed, 23 Aug 2017 11:13:28 +0000 (11:13 +0000)]
Merge "Fix issue with app not becoming visible" into oc-mr1-dev
Jorim Jaggi [Tue, 22 Aug 2017 12:55:17 +0000 (14:55 +0200)]
Fix issue with app not becoming visible
If an activity was started on top of Keyguard but didn't have
FLAG_SHOW_WHEN_LOCKED set yet, topRunningActivityLocked was
the activity, so we called minimalResumeActivity with the activity
but the activity wasn't made visible because
checkKeyguardVisibility returned false. Then, r.visible was set
to true without actually informing window manager about the
visibility change, which wasn't corrected in
resumeTopActivityInnerLocked because r.visible was already set to
true.
Then, it's windows were stuck in READY_TO_SHOW state because the
token was never made visible.
Fix this by informing by informing WM about visibilility change in
completeResumeLocked. This is a no-op if visibility was already
correct.
I belive this regression was originally caused from
I745e985766a1af97203e1d22b6443dabdd0c0363
Test: go/wm-smoke
Test: Set dream from "Timely Alarm Clock", wait until dreaming,
then adb shell am start -n
ch.bitspin.timely/ch.bitspin.timely.activity.SnoozeActivity_
Change-Id: Idbd47086885c3536fa01ab249309ebe37203ba0b
Fixes:
62373472
Makoto Onuki [Wed, 23 Aug 2017 10:23:51 +0000 (10:23 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev am:
ac1924ce18
am:
194abbd418
Change-Id: I5a7ec0620d4f01faee6e3e32ef06e81d5ef11f98
Makoto Onuki [Wed, 23 Aug 2017 10:14:23 +0000 (10:14 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
am:
ac1924ce18
Change-Id: I28c844b69323c1c3a304865ebd942f09c22ef585
TreeHugger Robot [Wed, 23 Aug 2017 10:07:39 +0000 (10:07 +0000)]
Merge "Reduce dropbox entries on lowram devices from 1000 to 300" into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 09:30:20 +0000 (09:30 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev am:
a68cdbe7b1
am:
74a9179cb9
Change-Id: I10b9dbaf5b864c20bd02ac810cb9ca5bcc4f6bd6
Lorenzo Colitti [Wed, 23 Aug 2017 09:20:51 +0000 (09:20 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
am:
a68cdbe7b1
Change-Id: Ic14d486ddd9f7ca2c5b31a79c48a88e0021bfd27
Lorenzo Colitti [Wed, 23 Aug 2017 09:08:46 +0000 (09:08 +0000)]
Merge "Fix transitioning between non-accept strict policies." into oc-mr1-dev
Lorenzo Colitti [Wed, 23 Aug 2017 06:05:09 +0000 (06:05 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev am:
9b601f2066
am:
331f8a98df
Change-Id: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569
Lorenzo Colitti [Wed, 23 Aug 2017 05:53:33 +0000 (05:53 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
am:
9b601f2066
Change-Id: I7fc47e60b2da5f39c26fb22c1325618f9948dd38
Lorenzo Colitti [Wed, 23 Aug 2017 05:46:34 +0000 (05:46 +0000)]
Merge "Don't completely stop offload if setting data limit fails." into oc-mr1-dev
Selim Cinek [Wed, 23 Aug 2017 04:23:57 +0000 (04:23 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev am:
3c47a11598
am:
09adc8f1a3
Change-Id: Iefd242f4b242ae0861f7f1fd9b8b8b89b06d6f20
Daniel Colascione [Wed, 23 Aug 2017 04:18:36 +0000 (04:18 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev am:
ea7a45eb43
am:
18479e859f
Change-Id: I5f4905341fa81361c1e0feb8a65944d93f840907
Selim Cinek [Wed, 23 Aug 2017 04:10:55 +0000 (04:10 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev
am:
3c47a11598
Change-Id: I874b39c9c76b13579f94b047a269e47602bda72d
TreeHugger Robot [Wed, 23 Aug 2017 04:04:54 +0000 (04:04 +0000)]
Merge "Fixed a bug with app provided media spans" into oc-mr1-dev
Daniel Colascione [Wed, 23 Aug 2017 03:54:08 +0000 (03:54 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
am:
ea7a45eb43
Change-Id: I95f60dc9be2a837de985bc26dd67d20b8efe70d8
Daniel Colascione [Wed, 23 Aug 2017 03:45:14 +0000 (03:45 +0000)]
Merge "Use /proc/pid/smaps_rollup when available" into oc-mr1-dev
David Stevens [Wed, 23 Aug 2017 03:38:56 +0000 (03:38 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev am:
bc06e43c49
am:
7f792333c2
Change-Id: Iad9fec571e686cec9ab1cc7164a798e5c5e83eca
Todd Kennedy [Wed, 23 Aug 2017 03:33:01 +0000 (03:33 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev am:
63b3eff31a
am:
f716244802
Change-Id: Ifd73501b25b8487dd036abb56252feae6ef96d94
David Stevens [Wed, 23 Aug 2017 03:27:28 +0000 (03:27 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev am:
f394ac4eba
am:
8b633d196c
Change-Id: I7909790b1a06df72d3bfd4c92beb29e0c3c43e07
Yin-Chia Yeh [Wed, 23 Aug 2017 03:20:16 +0000 (03:20 +0000)]
Merge "Image: fix typo" into oc-mr1-dev am:
ad3a36b13b
am:
e85bbc5751
Change-Id: I3e3fda244ada41f6d081d6a369d05345b869193c
Lucas Dupin [Wed, 23 Aug 2017 02:53:23 +0000 (02:53 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev am:
f00b496b4d
am:
c58de01f77
Change-Id: I91c715d8663833f10d829dc7feee963319ccc627
Selim Cinek [Wed, 23 Aug 2017 02:47:44 +0000 (02:47 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev am:
0e261a68d2
am:
3983ef634a
Change-Id: I4623c8255c715ff646b8392d69a725b720177f34
Svetoslav Ganov [Wed, 23 Aug 2017 02:40:38 +0000 (02:40 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev am:
7e73c70fce
am:
f6b0e7017c
Change-Id: I19b7ae0a939032d8093431673209fb241aa9de3c
Selim Cinek [Sat, 19 Aug 2017 01:53:44 +0000 (18:53 -0700)]
Transforming all texts of decorated media custom views
Since otherwise they would be illegible with the color
tranformation.
Change-Id: I5c1fa085fc3d6f682012c267d489a95fc7073f32
Fixes:
64810767
Test: manual, add decoratedMediaCustomView
Beverly [Wed, 23 Aug 2017 02:29:54 +0000 (02:29 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev am:
0951dbd00d
am:
d363e453e4
Change-Id: Ib78559f567c89489187c945535345c3ab9930972
David Stevens [Wed, 23 Aug 2017 02:25:41 +0000 (02:25 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
am:
bc06e43c49
Change-Id: I612edfe64cee0f0a192f56177fc7dff8d7ad9e2c
Todd Kennedy [Wed, 23 Aug 2017 02:11:25 +0000 (02:11 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev
am:
63b3eff31a
Change-Id: Ic710dd55d0ed1dbc95d70fe480dc9060b661c051
David Stevens [Wed, 23 Aug 2017 01:58:36 +0000 (01:58 +0000)]
Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev
OSDN Git Service
