OSDN Git Service
Adrian Roos [Thu, 6 Oct 2016 21:04:02 +0000 (21:04 +0000)]
Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev
am:
b9bb518632
Change-Id: Id8c2d014c1d66e7f1cd1a83e7074d46bc57e8644
Adrian Roos [Thu, 6 Oct 2016 21:03:54 +0000 (21:03 +0000)]
Ambient: Re-register all trigger sensors if one fires
am:
0288dcc825
Change-Id: Ia5e7c73eadb831e409aafd657427af98d242cdd2
Dirk Dougherty [Thu, 6 Oct 2016 21:03:02 +0000 (21:03 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am:
794e0d3578 am:
fc7475c5b3
am:
5d6be1abca
Change-Id: If6b795ed3864e721c1e06eee98839ca3505326a6
Dirk Dougherty [Thu, 6 Oct 2016 21:02:10 +0000 (21:02 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c am:
016f01ebfe
am:
7ceecc61ec
Change-Id: I0f7cf93959aed7eb8c425967f3b54e896d734606
Dirk Dougherty [Thu, 6 Oct 2016 21:01:10 +0000 (21:01 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c am:
8f8fe7df92
am:
7f5f8b1df8
Change-Id: Id93f4f296eb20ca951a0e1bde6df445ec6c7c4fc
Dirk Dougherty [Thu, 6 Oct 2016 21:00:18 +0000 (21:00 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711 am:
1241838fb4
am:
ddd2e0442e
Change-Id: Ie92e3fc281de627fd81df6196e7886ff6c4bcc0d
Dianne Hackborn [Thu, 6 Oct 2016 20:58:58 +0000 (20:58 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
am:
534a17e96c
Change-Id: Iba8a4f4447f4c70da0d466eaa824a24a6488a975
Dianne Hackborn [Thu, 6 Oct 2016 20:58:54 +0000 (20:58 +0000)]
Fix issue #
31305336: File corrupt: too many wake locks 101
am:
cb99a72e62
Change-Id: I01062999e2a1207c5d1bc826e8c9372c0fb012f7
Wei Liu [Thu, 6 Oct 2016 20:58:04 +0000 (20:58 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
am:
30a0f96250
Change-Id: I9b65c17d58907c861956bec0bc8f9f91ad8890af
Wei Liu [Thu, 6 Oct 2016 20:38:03 +0000 (20:38 +0000)]
Allow shell to acquire wakelock. DO NOT MERGE.
am:
898468657e
Change-Id: I443d617d58c23a12072c39b2e09b7f812cd46eaf
Christopher Tate [Thu, 6 Oct 2016 20:35:44 +0000 (20:35 +0000)]
Eliminate unnecessary object churn in job scheduler updating
am:
eafb535072
Change-Id: I4b43ea727720e73ad11a0615c221fe23ca9d34c0
Paul Stewart [Thu, 6 Oct 2016 20:34:32 +0000 (20:34 +0000)]
Merge "Tethering: check if configManager is null" into nyc-mr1-dev
am:
7d25ab7b11
Change-Id: I5ccb3d013d4adcdc7ec340da902fc4d3b3217d77
Rebecca Silberstein [Thu, 6 Oct 2016 20:34:26 +0000 (20:34 +0000)]
Tethering: check if configManager is null
am:
b07f140904
Change-Id: I71abfd9d6c91bbc3b3b2b3689756d3dd6818ac1e
Rob Carr [Thu, 6 Oct 2016 20:33:01 +0000 (20:33 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev
am:
c65dc5529e
Change-Id: Ib3cbf980a9779c5f9ff741ac9109a20bea549cb3
Robert Carr [Thu, 6 Oct 2016 20:32:54 +0000 (20:32 +0000)]
Prevent any rotation while seamless rotation is pending.
am:
b14d4abc16
Change-Id: Id6c19bec943592c5c39bdd75a563132650506151
Robert Carr [Thu, 6 Oct 2016 20:32:02 +0000 (20:32 +0000)]
Prevent triggering orientation changes until previous completes.
am:
45f6a2718a
Change-Id: I3a2a916d9e9d1eb38b990f8ea33201762298770c
Jason Monk [Thu, 6 Oct 2016 20:30:49 +0000 (20:30 +0000)]
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev
am:
3523728e77
Change-Id: I17a43a11ce391249d6ae3c3066024ee04b09468f
Jason Monk [Thu, 6 Oct 2016 20:30:44 +0000 (20:30 +0000)]
QS: Don't set flashlight state when we don't have an id
am:
ad32c550c0
Change-Id: I222d528ff37cc835bbcb66eb650954c49e5af935
Lei Yu [Thu, 6 Oct 2016 20:29:00 +0000 (20:29 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev
am:
3fd73a645a
Change-Id: I0328ef193a3c8e5686529245dcd181f9fa47b391
jackqdyulei [Thu, 6 Oct 2016 20:26:45 +0000 (20:26 +0000)]
Add "FILTER_NOT_HIDE" to filter out the apps.
am:
4bf191ca75
Change-Id: I96ad716830dc857091b8f66c9631d217a95b70b4
Bill Yi [Thu, 6 Oct 2016 20:25:02 +0000 (20:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
e03f970ab4 -s ours
Change-Id: Id98b3d6c2ced3b7734021533d8ff4acc24023acd
Bill Yi [Thu, 6 Oct 2016 20:24:55 +0000 (20:24 +0000)]
Import translations. DO NOT MERGE
am:
cf2df3bb6e -s ours
Change-Id: I52604a81767fbf9dd7aacb81daed530666836c67
Bill Yi [Thu, 6 Oct 2016 20:23:51 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
f22cb06b4d -s ours
Change-Id: Idc27632cf8baf85e2fcb39c34e4bfe2640c57646
Bill Yi [Thu, 6 Oct 2016 20:23:48 +0000 (20:23 +0000)]
Import translations. DO NOT MERGE
am:
49baec862b -s ours
Change-Id: I16dbe5ccdda50634607e20c212d8c454974faba5
Jorim Jaggi [Thu, 6 Oct 2016 20:22:39 +0000 (20:22 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev
am:
a92006ef6c
Change-Id: Iec8c618187b902a8837562f560bb661bd33aa569
Jorim Jaggi [Thu, 6 Oct 2016 20:22:36 +0000 (20:22 +0000)]
Reload state when user unlocks
am:
dadafd4109
Change-Id: I3480bdb8ea1a6f5a74f6a1a40a19634d53f86b00
Lorenzo Colitti [Thu, 6 Oct 2016 20:20:27 +0000 (20:20 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am:
291af5c568
am:
80f15e3b4c
Change-Id: Id92e4d2d5236107f3d88bc300066bab747804be1
Lorenzo Colitti [Thu, 6 Oct 2016 20:19:36 +0000 (20:19 +0000)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi. am:
f11ee9f592
am:
d2ad8ece53
Change-Id: Id152486610dd29d0839b06bcc45069643b0e335c
Lorenzo Colitti [Thu, 6 Oct 2016 20:18:28 +0000 (20:18 +0000)]
Slightly simplify IpManager#compareProvisioning. am:
b77b775213
am:
fdac9b608b
Change-Id: Ia89fe49084e94a0299c54f55660b1cfa6a92cc7f
Erik Kline [Thu, 6 Oct 2016 20:17:45 +0000 (20:17 +0000)]
Conditionally accept loss of on-link IPv6 DNS servers am:
5b437d6ff9
am:
d719d95139
Change-Id: I19bf8a4251d03d2648972a820b365c1c3e4996e3
Erik Kline [Thu, 6 Oct 2016 20:16:57 +0000 (20:16 +0000)]
Refactor "avoid bad wifi" logic into a utility class am:
065ab6ee40
am:
23cdacbec6
Change-Id: Id670d13b99ab6935b67335e19d2389e5b4f61111
Doris Liu [Thu, 6 Oct 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev
am:
8d4c87b0bf
Change-Id: Id887a0665caab2d196e7e70c7c0c307d476da3ba
Doris Liu [Thu, 6 Oct 2016 20:15:40 +0000 (20:15 +0000)]
Restrict AVD and VD parsing to the current element instead of the whole document
am:
1f859716a8
Change-Id: Ic2fe385089997f89675be8f8a1559db979387dbb
Tenghui Zhu [Thu, 6 Oct 2016 20:14:28 +0000 (20:14 +0000)]
Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev
am:
99224b311c
Change-Id: If59f1d136a96dbfb83311f99f7e08dff8927e72d
Teng-Hui Zhu [Thu, 6 Oct 2016 20:14:23 +0000 (20:14 +0000)]
Update JavaDoc about animatable on VectorDrawable
am:
bb12929470
Change-Id: I476d1416b0f734fbc87895c22de3e95efdbf25b9
Adam Lesinski [Thu, 6 Oct 2016 20:13:05 +0000 (20:13 +0000)]
Merge "Fix thread race caused double free issue." into nyc-mr1-dev
am:
68ec3695d0
Change-Id: I7b13469b249e5a159e3be9d1ee264f2616ebcd22
songjinshi [Thu, 6 Oct 2016 20:13:00 +0000 (20:13 +0000)]
Fix thread race caused double free issue.
am:
5754b41c20
Change-Id: Ic9dd6e9c6d216753d997da99158816682d5464d1
Bert McMeen [Thu, 6 Oct 2016 20:12:08 +0000 (20:12 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am:
70c6411a10 am:
19404c6f93
am:
20cf00152d
Change-Id: I55a7ee1cb4716de818d125bd168820838d323a17
Chris Tate [Thu, 6 Oct 2016 20:11:01 +0000 (20:11 +0000)]
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev
am:
ee28c8c22c
Change-Id: I51884bab34d7e0bd33e19c8cdfd780572880f96f
Christopher Tate [Thu, 6 Oct 2016 20:10:56 +0000 (20:10 +0000)]
Explicitly close FD binder parameters in backup/restore API calls
am:
91bb0e5cca
Change-Id: Ibdba35d9c4e17180a7593966b4d54d6fb9c03f02
Phil Weaver [Thu, 6 Oct 2016 20:09:42 +0000 (20:09 +0000)]
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
am:
8051c9222e
Change-Id: I4d4338d71140773df82f89c4fa67dcf8ee004d4c
Phil Weaver [Thu, 6 Oct 2016 20:09:37 +0000 (20:09 +0000)]
Make magnification ignore invisible wallpaper.
am:
473af05b82
Change-Id: Ie40d7eda7b36d8613e1dd035d9446c4239e20193
Dianne Hackborn [Thu, 6 Oct 2016 20:07:57 +0000 (20:07 +0000)]
Merge "Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev
am:
c26c98cd4a
Change-Id: I0024a7927ec686fd147ce5a1a477eb85c50e19a7
Dianne Hackborn [Thu, 6 Oct 2016 20:07:41 +0000 (20:07 +0000)]
Fix issue #
31403654: Elevation of privilege vulnerability in deviceidle service
am:
eb909e3cda
Change-Id: Ibbc6447d97c54b7393e557a831f0767edaea9b40
Jim Miller [Thu, 6 Oct 2016 20:06:21 +0000 (20:06 +0000)]
Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev
am:
bf79852ae4
Change-Id: I30f7db6cb9cd4cbb166402e0778591574cac27da
Jim Miller [Thu, 6 Oct 2016 20:06:16 +0000 (20:06 +0000)]
Add metrics logging for critical fingerprintd errors
am:
c57c8d934c
Change-Id: I7da4ef8b31bced6330656b2d4555d8e179ed4ddf
Adarsh Fernando [Thu, 6 Oct 2016 20:05:26 +0000 (20:05 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder am:
1face37061 am:
5fe735fe2c
am:
bce10d350d
Change-Id: I370104a076b8382a353065201fc0603b08081229
Bill Yi [Thu, 6 Oct 2016 20:04:09 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
b8e046a8a2 -s ours
Change-Id: I7a06f41a928e47341a0767a0c65d2c45af6ddef6
Bill Yi [Thu, 6 Oct 2016 20:04:06 +0000 (20:04 +0000)]
Import translations. DO NOT MERGE
am:
53edc8f204 -s ours
Change-Id: Ibc030ab4cd2881cfe500ce7be8b7477b7a352e2d
Bill Yi [Thu, 6 Oct 2016 20:02:51 +0000 (20:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
a381e699e0 -s ours
Change-Id: Ia7869d0fcde0a98cb706ac10836bad8d02f54272
Bill Yi [Thu, 6 Oct 2016 20:02:48 +0000 (20:02 +0000)]
Import translations. DO NOT MERGE
am:
453f915f94 -s ours
Change-Id: Ibc356ceb2016c7a7c6abfccb5db7b3bcdc11d2ee
Bill Yi [Thu, 6 Oct 2016 20:01:33 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
8990b8c29c -s ours
Change-Id: Iad921d79917548c8f38f68b78a6b09c84eff0cec
Bill Yi [Thu, 6 Oct 2016 20:01:30 +0000 (20:01 +0000)]
Import translations. DO NOT MERGE
am:
d2671e488d -s ours
Change-Id: I0b6000ab626e0aba864bb9b5ec182c338fba6de3
Hemal Patel [Thu, 6 Oct 2016 20:00:46 +0000 (20:00 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev am:
b4be5089f3 am:
14557acbfc
am:
d7ef4228e2
Change-Id: I70f2cbd4333eacbf239183b845816b8e3fb1150b
Hemal Patel [Thu, 6 Oct 2016 19:59:53 +0000 (19:59 +0000)]
Docs: Fixed the Service link am:
1918214589 am:
eb21088b67
am:
63b5e3ddd1
Change-Id: I1b1d34bb84a66c35268a7db754e5465b4c2b8d30
Christopher Wiley [Thu, 6 Oct 2016 19:58:38 +0000 (19:58 +0000)]
Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev
am:
fee635cc28
Change-Id: Id16b45b6340d9018ecf90f066b65574a02735c33
Christopher Wiley [Thu, 6 Oct 2016 19:58:33 +0000 (19:58 +0000)]
Implement untetherAll as calls to stopTethering
am:
fa6a486615
Change-Id: I20abc6e267bf38208e9f76f173a9fb584749c4f5
Christopher Wiley [Thu, 6 Oct 2016 19:57:19 +0000 (19:57 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev
am:
a6afc56f94
Change-Id: I1f67dc626f9f84894b1696c308a546f7f103b891
Christopher Wiley [Thu, 6 Oct 2016 19:57:15 +0000 (19:57 +0000)]
Notify NetworkPolicyManagerService on tethering changes
am:
deebfec90b
Change-Id: I43b25305c730966da83acdaccb127c27be0e2332
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:48 +0000 (19:55 +0000)]
Merge "Do not access MTP devices when disabled." into nyc-mr1-dev
am:
a40092d6d2
Change-Id: Ic036b736f9368ef4fc207f16a8e2c23feef77305
Philip P. Moltmann [Thu, 6 Oct 2016 19:55:28 +0000 (19:55 +0000)]
Do not access MTP devices when disabled.
am:
5201f1e61c
Change-Id: I9aa036678f2677054666b137533e61eaeac88159
Dianne Hackborn [Thu, 6 Oct 2016 19:54:30 +0000 (19:54 +0000)]
Merge "Work on issue #
29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev
am:
531c0237fc
Change-Id: Idbf5ea191fa9ccdacad76f5c3951b31ccb203b6a
Nimrod Gileadi [Thu, 6 Oct 2016 18:25:11 +0000 (19:25 +0100)]
resolve merge conflicts of
448489a to cw-f-dev
Change-Id: Idaff9ccaf74bf0ec82c6346eb383295b508c7324
Tucker Sylvestro [Thu, 6 Oct 2016 16:08:41 +0000 (16:08 +0000)]
Merge "Add the onDeviceOffBody API method to KeyStore" into cw-f-dev
TreeHugger Robot [Thu, 6 Oct 2016 09:34:47 +0000 (09:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 6 Oct 2016 09:34:10 +0000 (09:34 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 6 Oct 2016 01:21:21 +0000 (18:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic724c8be4da50b16d7550e8c378262e50897ff67
Auto-generated-cl: translation import
Bill Yi [Thu, 6 Oct 2016 01:13:10 +0000 (18:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I56b24b53ea2a6fce620699eacfcd152e4fd2558c
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 5 Oct 2016 19:51:03 +0000 (19:51 +0000)]
Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev
Erik Wolsheimer [Mon, 3 Oct 2016 20:07:19 +0000 (13:07 -0700)]
Do not listen for clock ticks, time changes, timezone changes, or time format changes when TextClock is not visible
BUG:
31840153
Change-Id: I11adf1036fb25b28aee5caba6daa1ab0d9d1f23a
Dirk Dougherty [Wed, 5 Oct 2016 18:53:14 +0000 (18:53 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am:
794e0d3578
am:
fc7475c5b3
Change-Id: Id3e3b71ed89d2b46cf7f7c0df1e69a1b8c986000
Dirk Dougherty [Wed, 5 Oct 2016 18:52:23 +0000 (18:52 +0000)]
Doc change: remove intl/nn from collections paths. am:
240ddd735c
am:
016f01ebfe
Change-Id: I069f07c183489c07d7010b8bb0fd85ac36216671
Dirk Dougherty [Wed, 5 Oct 2016 18:47:52 +0000 (18:47 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
am:
794e0d3578
Change-Id: Iba00fba1609011852b4b80b589859421a0933ca2
Dirk Dougherty [Wed, 5 Oct 2016 18:47:48 +0000 (18:47 +0000)]
Doc change: remove intl/nn from collections paths.
am:
240ddd735c
Change-Id: I9a8a5643b68675353f7a1b10453cddd51fcebcf8
Dirk Dougherty [Wed, 5 Oct 2016 18:40:47 +0000 (18:40 +0000)]
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 17:08:33 +0000 (17:08 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev am:
61d3faa52c
am:
8f8fe7df92
Change-Id: I3522d25f4259106707076d6bb8fb731d612cb372
Dirk Dougherty [Wed, 5 Oct 2016 17:07:44 +0000 (17:07 +0000)]
Update preview-community redirect to point at +AD. am:
559013e711
am:
1241838fb4
Change-Id: I721f56da659031ca0ba1c96af8413b6dae97f12f
Dirk Dougherty [Wed, 5 Oct 2016 17:02:25 +0000 (17:02 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev
am:
61d3faa52c
Change-Id: Ie2ae8a3d691c6b00a6d40ee98982ba8806d52047
Dirk Dougherty [Wed, 5 Oct 2016 17:02:21 +0000 (17:02 +0000)]
Update preview-community redirect to point at +AD.
am:
559013e711
Change-Id: I410968b7137d6378cd57cf7a4ce66aa8e3c2d7e6
Dirk Dougherty [Wed, 5 Oct 2016 16:52:36 +0000 (16:52 +0000)]
Merge "Update preview-community redirect to point at +AD." into nyc-dev
Dirk Dougherty [Wed, 5 Oct 2016 16:40:02 +0000 (09:40 -0700)]
Doc change: remove intl/nn from collections paths.
Change-Id: I45c0322d39a54e2565401d11bdc56d7e8e555cd2
Bug-Id:
31940660
Jakub Adámek [Wed, 5 Oct 2016 07:57:21 +0000 (07:57 +0000)]
Merge "Improving customization in DeviceDefault themes." into cw-f-dev
TreeHugger Robot [Wed, 5 Oct 2016 03:54:11 +0000 (03:54 +0000)]
Merge "Fix issue #
31305336: File corrupt: too many wake locks 101" into nyc-mr1-dev
TreeHugger Robot [Wed, 5 Oct 2016 03:49:24 +0000 (03:49 +0000)]
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
Dan Aminzade [Wed, 5 Oct 2016 03:09:59 +0000 (03:09 +0000)]
Merge "Automatically grant location and body sensors permissions to system packages that handle the com.android.fitness.TRACK intent." into cw-f-dev
Christopher Tate [Tue, 4 Oct 2016 23:34:48 +0000 (16:34 -0700)]
Eliminate unnecessary object churn in job scheduler updating
The arbitrary-caller "what job is currently running?" state inspector
returns a clone of the JobStatus record for it, not a live reference
to the scheduler's active state. That's appropriate for most cases
but when doing its own internal bookkeeping, the object churn in cloning
(especially, an unneeded clone just for purposes of comparing to some
other job!) is merely a huge waste of CPU and GC load.
So now we don't do that unnecessarily, and everything is much leaner.
Bug
31751985
Change-Id: Idacb52e9e5ca17b9e12b7ccd2fc2e1ec8b3547f6
Adrian Roos [Tue, 4 Oct 2016 20:35:10 +0000 (16:35 -0400)]
Ambient: Re-register all trigger sensors if one fires
Works around an issue where triggering one trigger sensor can
affect other trigger sensors. To be sure, re-register them all.
Change-Id: I4a0999275638e8a78c3c604fda6527aff0d9365a
Fixes:
31933894
Paul Stewart [Tue, 4 Oct 2016 23:17:09 +0000 (23:17 +0000)]
Merge "Tethering: check if configManager is null" into nyc-mr1-dev
Rebecca Silberstein [Tue, 4 Oct 2016 20:53:33 +0000 (13:53 -0700)]
Tethering: check if configManager is null
Before attempting to retrieve a carrier entitlement setting, first make
sure we have a carrier config manager and if we do have a carrier config
manager, the config it holds is not null.
Bug:
31929638
Change-Id: Iee476c476cb3de109cdccbd955b7fb986dd4267b
Rob Carr [Tue, 4 Oct 2016 20:58:42 +0000 (20:58 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev
* changes:
Prevent any rotation while seamless rotation is pending.
Prevent triggering orientation changes until previous completes.
Jason Monk [Tue, 4 Oct 2016 20:33:13 +0000 (20:33 +0000)]
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev
Lei Yu [Tue, 4 Oct 2016 19:51:22 +0000 (19:51 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev
Jason Monk [Tue, 4 Oct 2016 18:50:11 +0000 (14:50 -0400)]
QS: Don't set flashlight state when we don't have an id
Also add a dump to FlashlightController for better visibility.
Change-Id: I7e826c58598ccc18e211aaab31a2e4d039234fc1
Fixes:
31352536
Bill Yi [Tue, 4 Oct 2016 18:47:00 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:46:40 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:45:18 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Tue, 4 Oct 2016 18:35:09 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Jakub Adamek [Tue, 4 Oct 2016 09:14:35 +0000 (10:14 +0100)]
Improving customization in DeviceDefault themes.
Changes standard button color to white with 50% alpha.
Fixes background color in radio lists in settings.
Continues in removing duplication of color palette.
Bug:
31391353
Change-Id: I3778c070644e85d50743d34af57103b1a2b636ba
Jorim Jaggi [Tue, 4 Oct 2016 09:55:28 +0000 (09:55 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev
Lorenzo Colitti [Tue, 4 Oct 2016 07:50:20 +0000 (07:50 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev
am:
291af5c568
Change-Id: Idf4004f1cfb6b1b4c53d699f98faff5a55fc7b90
OSDN Git Service
