OSDN Git Service
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"
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
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
David Stevens [Wed, 23 Aug 2017 01:53:47 +0000 (01:53 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev
am:
f394ac4eba
Change-Id: I6518a549ae00e5f06907d01a1337a09b2e2c4614
TreeHugger Robot [Wed, 23 Aug 2017 01:51:12 +0000 (01:51 +0000)]
Merge "make sure package info is non-null" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 01:33:48 +0000 (01:33 +0000)]
Merge "Overcome disconnect during oem override"
Yin-Chia Yeh [Wed, 23 Aug 2017 01:29:29 +0000 (01:29 +0000)]
Merge "Image: fix typo" into oc-mr1-dev
am:
ad3a36b13b
Change-Id: I701cdbd6f46e88e5d0c95073a2d86a65a73c2258
David Stevens [Wed, 23 Aug 2017 01:28:20 +0000 (01:28 +0000)]
Merge "Only use WM screen rotation animation on default display" into oc-mr1-dev
Lucas Dupin [Wed, 23 Aug 2017 01:23:54 +0000 (01:23 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
am:
f00b496b4d
Change-Id: Iee45882aa11644046c374a7715b2ad836fb85d43
Selim Cinek [Wed, 23 Aug 2017 01:13:20 +0000 (01:13 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
am:
0e261a68d2
Change-Id: Ia87d5fce1444602f9d65e3f1c8ace960d25e8d01
Svetoslav Ganov [Wed, 23 Aug 2017 01:04:55 +0000 (01:04 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
am:
7e73c70fce
Change-Id: Ib9695b7707d8a1e9c093bd14e6470db8981f2e8b
Todd Kennedy [Wed, 23 Aug 2017 01:01:14 +0000 (01:01 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev am:
e4de49140d
am:
d10454ecc3
Change-Id: I179996d5c4b79b19fdacd08049ee5fdc047fe1bf
Aurimas Liutikas [Wed, 23 Aug 2017 00:54:28 +0000 (00:54 +0000)]
Merge "Merge "Enable Checkstyle for "repo upload" for more projects." am:
899398113a am:
4f5ce75cbd am:
01f9244e81 am:
ff82f33915" into oc-mr1-dev-plus-aosp
am:
409207c2dc
Change-Id: I9ad9728b7607649b83adf6e752e12b382068cbec
Beverly [Wed, 23 Aug 2017 00:50:51 +0000 (00:50 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
am:
0951dbd00d
Change-Id: I0658524b2f0d260ec2dda57f0f44f52cd312fd16
Amit Mahajan [Wed, 23 Aug 2017 00:46:40 +0000 (00:46 +0000)]
Merge "Merge "Make dun APNs as read-only by default." am:
6645fdad68 am:
be8044de83 am:
0e3b00f8b3 am:
066f35d10b" into oc-mr1-dev-plus-aosp
am:
4a57171659
Change-Id: I5933d4926c3193bf7e23a0bf6cf126349889e238
Android Build Merger (Role) [Wed, 23 Aug 2017 00:23:51 +0000 (00:23 +0000)]
Merge "Merge "Allow clearing instant app meta-data" into oc-mr1-dev am:
e391175330 am:
a80370745b"
TreeHugger Robot [Wed, 23 Aug 2017 00:20:12 +0000 (00:20 +0000)]
Merge "Image: fix typo" into oc-mr1-dev
TreeHugger Robot [Wed, 23 Aug 2017 00:15:08 +0000 (00:15 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider"
Svet Ganov [Wed, 23 Aug 2017 00:13:48 +0000 (00:13 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev am:
e391175330
am:
a80370745b
Change-Id: I719169bc27017a8e8c4d6a858c14ca2a458acc95
Todd Kennedy [Wed, 23 Aug 2017 00:06:45 +0000 (00:06 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev
am:
e4de49140d
Change-Id: Ia86f2d6097877e894fed40f12c5c49f26a1b690d
Selim Cinek [Wed, 23 Aug 2017 00:06:29 +0000 (00:06 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev am:
9d41e8cd47
am:
a7ea41c7d7
Change-Id: I91899094a4798d83b8e2e24b41d5f11a3a9bb045
Android Build Merger (Role) [Wed, 23 Aug 2017 00:01:51 +0000 (00:01 +0000)]
Merge "Merge "Enable Checkstyle for "repo upload" for more projects." am:
899398113a am:
4f5ce75cbd am:
01f9244e81 am:
ff82f33915" into oc-mr1-dev-plus-aosp
Aurimas Liutikas [Tue, 22 Aug 2017 23:57:58 +0000 (23:57 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am:
899398113a am:
4f5ce75cbd am:
01f9244e81
am:
ff82f33915
Change-Id: I264da4ad2d7664f82c8934ead7f5644498610a99
Lucas Dupin [Tue, 22 Aug 2017 23:56:22 +0000 (23:56 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev am:
3edfdf345e
am:
8b2360ae08
Change-Id: I69240becd307370c1bb1813ed9b61f3cea3676c7
Android Build Merger (Role) [Tue, 22 Aug 2017 23:55:34 +0000 (23:55 +0000)]
Merge "Merge "Make dun APNs as read-only by default." am:
6645fdad68 am:
be8044de83 am:
0e3b00f8b3 am:
066f35d10b" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Tue, 22 Aug 2017 23:54:18 +0000 (23:54 +0000)]
Merge "Ensure 36dps around keyguard bouncer" into oc-mr1-dev
Amit Mahajan [Tue, 22 Aug 2017 23:47:14 +0000 (23:47 +0000)]
Merge "Make dun APNs as read-only by default." am:
6645fdad68 am:
be8044de83 am:
0e3b00f8b3
am:
066f35d10b
Change-Id: If3a99426b3b287c54f01526a0f70b3cd239cd899
Svet Ganov [Tue, 22 Aug 2017 23:39:07 +0000 (23:39 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev
am:
e391175330
Change-Id: I35fea7acf6bd4084b06cb17c580c75df08ef484c
Aurimas Liutikas [Tue, 22 Aug 2017 23:38:44 +0000 (23:38 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am:
899398113a am:
4f5ce75cbd
am:
01f9244e81
Change-Id: I878b8ec0564de9bff7fd8e3f507f2a6a7a07e7db
Amit Mahajan [Tue, 22 Aug 2017 23:30:25 +0000 (23:30 +0000)]
Merge "Make dun APNs as read-only by default." am:
6645fdad68 am:
be8044de83
am:
0e3b00f8b3
Change-Id: I61cdd3c5c8fba049c6a3748dde196fe232ece20b
Selim Cinek [Fri, 18 Aug 2017 23:17:51 +0000 (16:17 -0700)]
Fixed a bug with app provided media spans
Since notifications are colorized now,
We need to clear color spans from media
notifications, otherwise the contrast won't
be ensured.
Test: use media notification with color span, observe no span
Fixes:
64445955
Change-Id: Ib4f5b14196c604468c8c00ba48f294b1b2d102e3
Nate Fischer [Tue, 22 Aug 2017 23:21:15 +0000 (23:21 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev am:
b2456e6194
am:
0cd12a83c6
Change-Id: I5c0529021e6bbba15090bfc500bb4610a9a4c0d7
Selim Cinek [Tue, 22 Aug 2017 23:20:34 +0000 (23:20 +0000)]
Merge "Fixed a bug where the colorization was lost when reinflating" into oc-mr1-dev
Selim Cinek [Tue, 22 Aug 2017 23:20:24 +0000 (23:20 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
am:
9d41e8cd47
Change-Id: I36099788ad09bb8035374c2ca27caffabc21dfb0
Svetoslav Ganov [Tue, 22 Aug 2017 23:12:25 +0000 (23:12 +0000)]
Merge "Properly compute default and system set flag on an upgrade" into oc-mr1-dev
Lucas Dupin [Tue, 22 Aug 2017 23:12:07 +0000 (23:12 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
am:
3edfdf345e
Change-Id: I49871d0872e6b4f8194d3425a59cd5661b5623b7
David Stevens [Thu, 17 Aug 2017 21:55:47 +0000 (14:55 -0700)]
Fix activity manager timeout during shutdown
Flip the return value for ActivityStack.goToSleepIfPossible from true if
something needs to be done to true if the stack successfully went to
sleep. An incorrect check in ActivityStack.checkReadyForSleep was
causing ActivityStackSupervisor to sometimes not get notified when a
stack finished stopping during shutdown. Also, no-delay calls to
ActivityStackSupervisor#checkReadyForSleepLocked would fail to put
activities to sleep.
BUG:
64756886
Test: go/run-boottest
Change-Id: Icec590ed9a0e0f035881b7eb03a280787dcfced1
TreeHugger Robot [Tue, 22 Aug 2017 23:01:21 +0000 (23:01 +0000)]
Merge "Volume dialog touch-tracking is disabled when in zenMute." into oc-mr1-dev
Nate Fischer [Tue, 22 Aug 2017 23:01:12 +0000 (23:01 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
am:
b2456e6194
Change-Id: I3066dd0edd6c125b2e7fdab7fc07624f4c8688a5
Todd Kennedy [Tue, 22 Aug 2017 23:00:58 +0000 (23:00 +0000)]
Merge "Only log resolution when starting activities" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:51:21 +0000 (22:51 +0000)]
Merge "Fix AccessPointPreferenceTest and add updateIcon test."
TreeHugger Robot [Tue, 22 Aug 2017 22:49:03 +0000 (22:49 +0000)]
Merge "Allow clearing instant app meta-data" into oc-mr1-dev
TreeHugger Robot [Tue, 22 Aug 2017 22:48:14 +0000 (22:48 +0000)]
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
Aurimas Liutikas [Tue, 22 Aug 2017 22:48:13 +0000 (22:48 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am:
899398113a
am:
4f5ce75cbd
Change-Id: I85128958ed4e882cb996767f2abbb2146bf0fb3d
TreeHugger Robot [Tue, 22 Aug 2017 22:45:52 +0000 (22:45 +0000)]
Merge "heif: add new file and mime types to MediaScanner"
TreeHugger Robot [Tue, 22 Aug 2017 22:42:57 +0000 (22:42 +0000)]
Merge "Fix issue where clock scale would be wrong in AOD" into oc-mr1-dev
Nate Fischer [Tue, 22 Aug 2017 22:40:39 +0000 (22:40 +0000)]
Merge "WebView: rename initSafeBrowsing and remove shutdownSafeBrowsing" into oc-mr1-dev
Lorenzo Colitti [Tue, 22 Aug 2017 22:38:06 +0000 (22:38 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev am:
45fb339d83
am:
e3aeae68f3
Change-Id: I999d1d1bf72e7ab02c5d17f37aad00bc711d3fc5
TreeHugger Robot [Tue, 22 Aug 2017 22:31:54 +0000 (22:31 +0000)]
Merge "Check contents of Bundle for ScoredNetwork.equals"
Aurimas Liutikas [Tue, 22 Aug 2017 22:30:37 +0000 (22:30 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am:
899398113a
Change-Id: Ie9887a55bbdde8bf978e6711b258846f35e2383c
Lorenzo Colitti [Tue, 22 Aug 2017 22:19:36 +0000 (22:19 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
am:
45fb339d83
Change-Id: I61786d61fe1422e429c0dd9eadaff6f02eb850e7
Treehugger Robot [Tue, 22 Aug 2017 22:19:28 +0000 (22:19 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
Lorenzo Colitti [Tue, 22 Aug 2017 22:06:46 +0000 (22:06 +0000)]
Merge "Tethering offload stats updates are eventually consistent" into oc-mr1-dev
Selim Cinek [Thu, 17 Aug 2017 23:42:51 +0000 (16:42 -0700)]
Fixed a bug where the colorization was lost when reinflating
Because we're reloading the drawable, it's colorfilter was lost.
Let's make sure we're reapplying any tints that we had when doing so.
Test: add colorized notification, reinflate
Change-Id: I11e59636317eb65da5573529f0dd44571ca10cce
Fixes:
63901744
Selim Cinek [Thu, 17 Aug 2017 00:50:20 +0000 (17:50 -0700)]
Fixed a bug with decorated custom views
Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.
Fixes:
62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a
TreeHugger Robot [Tue, 22 Aug 2017 21:52:27 +0000 (21:52 +0000)]
Merge "make updateWidth aware of side margins"
Aurimas Liutikas [Fri, 28 Apr 2017 21:30:26 +0000 (14:30 -0700)]
Enable Checkstyle for "repo upload" for more projects.
This CL enables Checkstyle for the following directories:
- core/java/android/
- core/tests/coretests/src/android/
Bug:
34746646
Test: None
Change-Id: Ib8b3f198000be19e9a7a61aa5abd61d827454eba
(cherry picked from commit
e5abb866a56582ffc705c261a2cab20c2331e6a3)
Todd Kennedy [Tue, 22 Aug 2017 17:48:18 +0000 (10:48 -0700)]
make sure package info is non-null
Change-Id: Ib867075a79712de36c46f862d13e5fc1d0958f00
Fixes:
64812776
Test: manual
Todd Kennedy [Tue, 22 Aug 2017 20:52:00 +0000 (20:52 +0000)]
Merge "Use the installer package name for broadcasts" into oc-mr1-dev am:
0862898a34
am:
4c7117af59
Change-Id: Ia2f756d0e26be2758bf5e63a4eec458af2e2fd8d
OSDN Git Service
