OSDN Git Service
Junda Liu [Wed, 25 May 2016 21:39:10 +0000 (21:39 +0000)]
Merge "Add restricted card state to telephony manager." into nyc-mr1-dev
Alan Viverette [Wed, 25 May 2016 21:28:07 +0000 (21:28 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
am:
29c01336db
* commit '
29c01336db4b2db5582904597559b14563543054':
Fix DatePicker.setMin/MaxDate()
Change-Id: Ief9107dfd244cb2bad45e0d6f3e183dc2d1fbd11
Robin Lee [Wed, 25 May 2016 21:19:08 +0000 (21:19 +0000)]
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
am:
48b18f4fa9
* commit '
48b18f4fa994e201e3eb4cca1e7c823b198359c5':
Return legacy VPN info regardless of lockdown mode
Change-Id: I202f19946246aa52d37c3c6bb7665cc58ddf8572
Alan Viverette [Wed, 25 May 2016 21:17:52 +0000 (21:17 +0000)]
Merge "Fix DatePicker.setMin/MaxDate()" into nyc-dev
Danny Epstein [Wed, 25 May 2016 21:09:19 +0000 (21:09 +0000)]
Merge "Left and right margins for watch preferences." into nyc-mr1-dev
Zachary Kuznia [Wed, 25 May 2016 21:06:19 +0000 (21:06 +0000)]
Merge "Ensure MotionEvent.split() won\'t be given an invalid value." into nyc-dev
am:
a5e6601ad1
* commit '
a5e6601ad1db77563038946ed1316134f7e55ee6':
Ensure MotionEvent.split() won't be given an invalid value.
Change-Id: Ide2f549e62750f39cecee18a71e0f35d4724d1f3
Robin Lee [Wed, 25 May 2016 21:05:53 +0000 (21:05 +0000)]
Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev
Zach Kuznia [Wed, 25 May 2016 20:57:24 +0000 (20:57 +0000)]
Merge "Ensure MotionEvent.split() won't be given an invalid value." into nyc-dev
Jeff Sharkey [Wed, 25 May 2016 20:51:07 +0000 (20:51 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
am:
dfe232c763
* commit '
dfe232c7636d16379191442bdb2bac59d7a60f5c':
API council feedback: hide and document.
Change-Id: Icfcb4e2a9892ecc5dab61cb78598e48fa7714a26
Sunny Goyal [Wed, 25 May 2016 20:45:43 +0000 (20:45 +0000)]
Merge "Maintaining diff for all widget operations instead of just the Views update" into nyc-mr1-dev
TreeHugger Robot [Wed, 25 May 2016 20:43:55 +0000 (20:43 +0000)]
Merge "API council feedback: hide and document." into nyc-dev
Mady Mellor [Wed, 25 May 2016 20:35:45 +0000 (20:35 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev
am:
b6f640607b
* commit '
b6f640607b5b8124b1a1c216ea4264511b145774':
Fix clipping not being activated on children in groups
Change-Id: I9bb55c13928be62641884d1381baf984c43acac6
Mady Mellor [Wed, 25 May 2016 20:22:41 +0000 (20:22 +0000)]
Merge "Fix clipping not being activated on children in groups" into nyc-dev
Zachary Kuznia [Fri, 13 May 2016 20:11:36 +0000 (13:11 -0700)]
Ensure MotionEvent.split() won't be given an invalid value.
b/
27496784
Change-Id: I28bb4ac5bb8a705e7af9b22b2b56cd4061aa06a0
Robert Carr [Wed, 25 May 2016 19:21:34 +0000 (19:21 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev
am:
39e8022a75
* commit '
39e8022a75507be06179c3de7358cebb1bb22e06':
Force pending transactions to flush before screenshot.
Change-Id: Ib8dd84af143226e2b62cdfa51066e68ba7802d28
TreeHugger Robot [Wed, 25 May 2016 19:16:12 +0000 (19:16 +0000)]
Merge "Force pending transactions to flush before screenshot." into nyc-dev
Mady Mellor [Wed, 25 May 2016 19:10:59 +0000 (19:10 +0000)]
Merge "Changes based on API council feedback for performContextClick" into nyc-dev
am:
7c17e70f2f
* commit '
7c17e70f2f795ca06006ff2560c8b8211ce1dd52':
Changes based on API council feedback for performContextClick
Change-Id: Ief8c3036b93c28b27ba2f117ec656d38a1562fcf
Philip P. Moltmann [Wed, 25 May 2016 19:10:37 +0000 (19:10 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
am:
b4a45472bb
* commit '
b4a45472bb2d7d5319fe020c228e3c9169a5e5a3':
Add Samsung print recommendation plugin.
Change-Id: I88c72b3c3ce3a190af297c78373fbfd7e2f61ef7
Alex Klyubin [Wed, 25 May 2016 19:01:27 +0000 (19:01 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0 am:
d1df52a46b
am:
56f2f91793
* commit '
56f2f91793e8eb296ba8826deaaacd77b2081d64':
Fix incorrect cleartext attribute
Change-Id: I07954d6b54c4b736ebcd97f0ee442133f685e129
Mady Mellor [Wed, 25 May 2016 19:00:07 +0000 (19:00 +0000)]
Merge "Changes based on API council feedback for performContextClick" into nyc-dev
Philip P. Moltmann [Wed, 25 May 2016 18:51:11 +0000 (18:51 +0000)]
Merge "Add Samsung print recommendation plugin." into nyc-dev
Chad Brubaker [Wed, 25 May 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0 am:
56f32483b0
am:
d1df52a46b
* commit '
d1df52a46beb5babd0d9f3257b2ade53c9c763cf':
Fix incorrect cleartext attribute
Change-Id: I613e1eae55525d0326a8513ed25903bbaf0d3fb9
Selim Cinek [Wed, 25 May 2016 18:25:33 +0000 (18:25 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev
am:
6088cf67e8
* commit '
6088cf67e8895b5ae09e8d99d57f9ae9279a2470':
Fixed a bug where the expand button was invisible
Change-Id: Ia7bfba0e245781f80bb1d7a9a068f765661177a7
Alex Klyubin [Wed, 25 May 2016 18:24:31 +0000 (18:24 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs am:
f2e0a719d0
am:
56f32483b0
* commit '
56f32483b04723bf750e51badcfec3203c352d32':
Fix incorrect cleartext attribute
Change-Id: I689b8df2a928e63b7c0b06198b06e2c6798bcba5
Chad Brubaker [Wed, 25 May 2016 18:16:03 +0000 (18:16 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
am:
f2e0a719d0
* commit '
f2e0a719d00c4a7c6865f6784efc9b3f88421136':
Fix incorrect cleartext attribute
Change-Id: I83bfa396764d6724ceb483e256a96b929c7886d4
Selim Cinek [Wed, 25 May 2016 18:14:56 +0000 (18:14 +0000)]
Merge "Fixed a bug where the expand button was invisible" into nyc-dev
Chris Banes [Wed, 25 May 2016 18:05:21 +0000 (18:05 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev
am:
163236156f
* commit '
163236156f28449272e16193930692d2cc0011cb':
Fix text appearances not working in colored button styles
Change-Id: Ib26212b58dde81eeb222721d39df7ce66502265b
Alex Klyubin [Wed, 25 May 2016 18:04:53 +0000 (18:04 +0000)]
Merge "Fix incorrect cleartext attribute" into mnc-mr-docs
Chris Banes [Wed, 25 May 2016 17:57:11 +0000 (17:57 +0000)]
Merge "Fix text appearances not working in colored button styles" into nyc-dev
Chong Zhang [Wed, 25 May 2016 17:42:33 +0000 (17:42 +0000)]
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
am:
15818e1156
* commit '
15818e1156101f1d3a01009e7bc223d8ae88546d':
Destroy saved surfaces if one of the last visible windows gets removed
Change-Id: I143743940263578e7111ae41eb7b88c005be18a6
Chong Zhang [Wed, 25 May 2016 17:32:19 +0000 (17:32 +0000)]
Merge "Destroy saved surfaces if one of the last visible windows gets removed" into nyc-dev
Jason Monk [Wed, 25 May 2016 17:21:51 +0000 (17:21 +0000)]
Merge "QS Edit: Fix up accessibility" into nyc-dev
am:
c4b6e2a184
* commit '
c4b6e2a1849690a7f8dfa3be75ee84f1453f8224':
QS Edit: Fix up accessibility
Change-Id: I78ebafd7f118fc1220e1c76b0823d229a69ebd0f
Jason Monk [Wed, 25 May 2016 17:21:44 +0000 (17:21 +0000)]
Merge "QS Edit: Hide black bar in landscape" into nyc-dev
am:
630436c9ed
* commit '
630436c9ed893b38059e4c9a6e03a753a2e84d3a':
QS Edit: Hide black bar in landscape
Change-Id: I1691d9911b646f93c1fecab0cdb03506b4c357cb
Jason Monk [Wed, 25 May 2016 17:21:32 +0000 (17:21 +0000)]
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev
am:
7e10e630b4
* commit '
7e10e630b4df10b9ce92953e98dec9d2cda1bfa2':
QS API: Handle return value from bindServiceAsUser
Change-Id: I40048d7a00969f63cbd8bc969417506a8afaa6f6
Jason Monk [Wed, 25 May 2016 17:21:17 +0000 (17:21 +0000)]
Merge "QS: Fix QS touch breaking" into nyc-dev
am:
8fd8a4fde8
* commit '
8fd8a4fde8356bf2d3eb2dda4b6d91e61e80c0c6':
QS: Fix QS touch breaking
Change-Id: I741f1b1a2eedc734ce3e182b50f6cf17536ab0d8
Julia Reynolds [Wed, 25 May 2016 17:15:07 +0000 (17:15 +0000)]
Merge changes from topic \'cps\' into nyc-dev
am:
d3827be162
* commit '
d3827be1620a8cb3bb1dfa42d07334f3be4382ef':
Api updates.
Note timezone changes.
Change-Id: Iac6f6a3c65f2a22792bef8ee3d905f8324eb084e
Jason Monk [Wed, 25 May 2016 17:11:30 +0000 (17:11 +0000)]
Merge "QS Edit: Fix up accessibility" into nyc-dev
Jason Monk [Wed, 25 May 2016 17:11:22 +0000 (17:11 +0000)]
Merge "QS Edit: Hide black bar in landscape" into nyc-dev
Jason Monk [Wed, 25 May 2016 17:11:14 +0000 (17:11 +0000)]
Merge "QS API: Handle return value from bindServiceAsUser" into nyc-dev
Jason Monk [Wed, 25 May 2016 17:11:07 +0000 (17:11 +0000)]
Merge "QS: Fix QS touch breaking" into nyc-dev
Julia Reynolds [Wed, 25 May 2016 17:09:24 +0000 (17:09 +0000)]
Merge changes from topic 'cps' into nyc-dev
* changes:
Api updates.
Note timezone changes.
Julia Reynolds [Tue, 17 May 2016 20:55:18 +0000 (16:55 -0400)]
Api updates.
Change-Id: Ibafef673c54e4ff07bca2bbe70db6cad799b8033
Fixes:
28818092
Julia Reynolds [Wed, 25 May 2016 16:29:55 +0000 (12:29 -0400)]
Note timezone changes.
Bug:
28945282
Change-Id: I62fc62e359435f19fecd7e52b2fe778475c5804c
Mady Mellor [Wed, 25 May 2016 16:49:02 +0000 (09:49 -0700)]
Changes based on API council feedback for performContextClick
Added an overloaded version with (float x, float y).
Fixes:
28295818
Change-Id: I41c2bf225964436655986b3ad4d0c630c658e38b
Chris Banes [Wed, 25 May 2016 14:40:46 +0000 (15:40 +0100)]
Fix text appearances not working in colored button styles
Caused by using an explicit textColor in the base
styles, which will always override any textColors in the
text appearance.
BUG:
28933171
Change-Id: I3a9b2884cdd66b329593ae5cea0c314244f4f116
John Reck [Wed, 25 May 2016 16:47:17 +0000 (16:47 +0000)]
Merge "Fix a translate issue with saveLayer" into nyc-dev
am:
f4ae997719
* commit '
f4ae9977190d4d406ec5e2aaddb78ea84873f1f0':
Fix a translate issue with saveLayer
Change-Id: Iddc404524b2d1af296519fcf0b426d97c89f191c
Diego Perez [Wed, 25 May 2016 16:47:14 +0000 (16:47 +0000)]
Merge "Workaround to display menus for AppCompat themes" into nyc-dev
am:
36cd747bb6
* commit '
36cd747bb6030c9c19dbab6bdfd85b2106017973':
Workaround to display menus for AppCompat themes
Change-Id: I65ce3798aa3fc2d851126d88b3dc1834d05b5393
Alan Viverette [Wed, 25 May 2016 16:34:55 +0000 (12:34 -0400)]
Fix DatePicker.setMin/MaxDate()
Previously it would only allow year changes, which... doesn't make sense.
Bug:
28953902
Change-Id: I9b15b96662d9d496e11fb426ff23f14b26e90800
Jason Monk [Wed, 25 May 2016 16:30:51 +0000 (12:30 -0400)]
QS: Fix QS touch breaking
Seems not all of the QS container logic was inside the inflate
callback.
Change-Id: I78a8b40d1c181f5dac7127a5b5d20d45ae0f333e
Fixes:
28177371
John Reck [Wed, 25 May 2016 16:27:30 +0000 (16:27 +0000)]
Merge "Fix a translate issue with saveLayer" into nyc-dev
Alan Viverette [Wed, 25 May 2016 16:24:51 +0000 (16:24 +0000)]
Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev
am:
cfbca5640c
* commit '
cfbca5640ca435e1b501254c9cf8b66746799d7e':
Use ICU's Calendar class in date picker & related classes
Change-Id: Ideb570415bab784778bb12709d04a37ad3c29275
Diego Perez [Wed, 25 May 2016 16:23:55 +0000 (16:23 +0000)]
Merge "Workaround to display menus for AppCompat themes" into nyc-dev
Alan Viverette [Wed, 25 May 2016 16:20:14 +0000 (16:20 +0000)]
Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev
Kenny Guy [Wed, 25 May 2016 15:57:55 +0000 (15:57 +0000)]
Merge "Update suspended to disabled." into nyc-dev
am:
646a817caf
* commit '
646a817caff4875462c15128f2e8c5d5c83629b3':
Update suspended to disabled.
Change-Id: If0d081d5f5ebe3655b972baa4360ccc7dbfeb121
Kenny Guy [Wed, 25 May 2016 15:49:51 +0000 (15:49 +0000)]
Merge "Update suspended to disabled." into nyc-dev
Alan Viverette [Wed, 25 May 2016 15:42:42 +0000 (11:42 -0400)]
Use ICU's Calendar class in date picker & related classes
Also organizes imports.
Bug:
28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
Jason Monk [Wed, 25 May 2016 15:37:47 +0000 (11:37 -0400)]
QS API: Handle return value from bindServiceAsUser
To avoid crashes better.
Change-Id: I72e74729fbc0b1400c21e1ebc165b565ecd13fba
Fixes:
28721139
Jason Monk [Wed, 25 May 2016 15:19:04 +0000 (11:19 -0400)]
QS Edit: Hide black bar in landscape
Change-Id: I954e5571c01945b697c6254c168c1830467ff7db
Fixes:
28924803
Adam Powell [Wed, 25 May 2016 15:09:49 +0000 (15:09 +0000)]
Merge "Update preloaded drawables" into nyc-dev
am:
ef817a1deb
* commit '
ef817a1debbad9aa3de5ff49765b9a9a72fc73a2':
Update preloaded drawables
Change-Id: Ic0a4a3bc2c375e5e3af837d50a4613ed5ffe7eff
Adam Powell [Wed, 25 May 2016 14:59:32 +0000 (14:59 +0000)]
Merge "Update preloaded drawables" into nyc-dev
Jason Monk [Wed, 25 May 2016 14:54:06 +0000 (10:54 -0400)]
QS Edit: Fix up accessibility
Change-Id: I13d426d4ae447c7db074bc7165067870bd8cae5d
Fixes:
28913622
Alan Viverette [Wed, 25 May 2016 14:27:58 +0000 (14:27 +0000)]
Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev
am:
5c9444216d
* commit '
5c9444216d187ec2126fdd200e499a1fb3f6ee62':
Prevent LayerDrawable bounds updates from being re-entrant
Change-Id: I7517614a5bc600f85c232779a18bf6fbf1f81068
Alan Viverette [Wed, 25 May 2016 14:27:54 +0000 (14:27 +0000)]
Merge "Default system theme should be DeviceDefault" into nyc-dev
am:
10ed7de7ae
* commit '
10ed7de7ae1ef1ac10b596c688182642acaca674':
Default system theme should be DeviceDefault
Change-Id: I0cdadd02499b071168ddcd26c5c1b93d4067fe9d
Alan Viverette [Wed, 25 May 2016 14:19:39 +0000 (14:19 +0000)]
Merge "Prevent LayerDrawable bounds updates from being re-entrant" into nyc-dev
Alan Viverette [Wed, 25 May 2016 14:18:27 +0000 (14:18 +0000)]
Merge "Default system theme should be DeviceDefault" into nyc-dev
Ricky Wai [Wed, 25 May 2016 13:18:26 +0000 (13:18 +0000)]
Hide work profile key in user credentials screen
am:
d398244513
* commit '
d398244513c62c9ea14a0f1c6ffef832e803c16f':
Hide work profile key in user credentials screen
Change-Id: I7609dc8bc68e9c9eb2a969b58b31815d27d7fc4a
Ricky Wai [Wed, 25 May 2016 13:14:23 +0000 (13:14 +0000)]
Do not allow DPM.resetPassword() when child profile exists or user is locked
am:
977ade26dd
* commit '
977ade26dd8bc6a442be2db2470459058246844f':
Do not allow DPM.resetPassword() when child profile exists or user is locked
Change-Id: I05277051a8f30c4d020440dd01b5dc284d552fd4
Ricky Wai [Wed, 25 May 2016 13:14:21 +0000 (13:14 +0000)]
Merge "Unlock work profile storage even work mode is off" into nyc-dev
am:
f420c413b9
* commit '
f420c413b9abd58dcbea881535da5b603f7f7afc':
Unlock work profile storage even work mode is off
Change-Id: I7ecd5f3658a9507b0bee4dea390a88ff7ef9a82e
Ricky Wai [Wed, 25 May 2016 13:11:25 +0000 (13:11 +0000)]
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
am:
99df649aa4
* commit '
99df649aa4907d9f9c6fe4bdf4acb517003f97f2':
Do not tie managed profile synchronously in onUnlockUser()
Change-Id: Iea5c0c6bccbce1a7b81fec9f38589ffd31475a24
Ricky Wai [Tue, 24 May 2016 18:27:08 +0000 (19:27 +0100)]
Hide work profile key in user credentials screen
Bug:
28878708
Change-Id: Ib250fae2388b061430d93b7d65133002ce664993
Ricky Wai [Tue, 24 May 2016 14:02:41 +0000 (15:02 +0100)]
Do not allow DPM.resetPassword() when child profile exists or user is locked
Bug:
28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
Ricky Wai [Wed, 25 May 2016 13:06:23 +0000 (13:06 +0000)]
Merge "Unlock work profile storage even work mode is off" into nyc-dev
Ricky Wai [Wed, 25 May 2016 13:04:31 +0000 (13:04 +0000)]
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev
Yohei Yukawa [Wed, 25 May 2016 04:57:43 +0000 (04:57 +0000)]
Merge "Make IMM more robust to spurious window focus-in" into nyc-dev
am:
50c33d1ca1
* commit '
50c33d1ca1218ec00eb37f66a7c11315603c9ef7':
Make IMM more robust to spurious window focus-in
Change-Id: I3c80320a5c6711bf3aaeb3043fe54c741c127966
Yohei Yukawa [Wed, 25 May 2016 04:47:30 +0000 (04:47 +0000)]
Merge "Make IMM more robust to spurious window focus-in" into nyc-dev
Seigo Nonaka [Wed, 25 May 2016 03:30:06 +0000 (03:30 +0000)]
Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
am:
7c8305bcfe
* commit '
7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
Use original theme for SuggestsionsPopupWindow
Change-Id: I77ed2205c4dc34786c1b931a00f64187a878395e
Hugo Benichi [Wed, 25 May 2016 03:29:59 +0000 (03:29 +0000)]
Merge "Fix default network transition event recording" into nyc-dev
am:
9d4e66ece6
* commit '
9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
Fix default network transition event recording
Change-Id: Ie025342be8e13bfd1d3f4b45d522cc30b56ef606
Seigo Nonaka [Wed, 25 May 2016 03:24:10 +0000 (03:24 +0000)]
Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
Hugo Benichi [Wed, 25 May 2016 03:22:31 +0000 (03:22 +0000)]
Merge "Fix default network transition event recording" into nyc-dev
Hang Yin [Wed, 25 May 2016 03:18:07 +0000 (03:18 +0000)]
Merge "Created 4 camera preview stress test cases." into nyc-dev
am:
581387a4ae
* commit '
581387a4aebd88debe065dd2957ad59d0bb000b5':
Created 4 camera preview stress test cases.
Change-Id: I992538ee1e1df22fdca5798df7ccaae899e239ec
Suprabh Shukla [Wed, 25 May 2016 03:14:36 +0000 (03:14 +0000)]
Merge "Updating user restrictions when they are removed" into nyc-dev
am:
1893c4cea7
* commit '
1893c4cea7825e9f44f08b6165a04fd90c1adf9d':
Updating user restrictions when they are removed
Change-Id: Iccd07150139f025fa16b74eee2670252b6c17a3d
Hang Yin [Wed, 25 May 2016 03:14:02 +0000 (03:14 +0000)]
Merge "Created 4 camera preview stress test cases." into nyc-dev
TreeHugger Robot [Wed, 25 May 2016 03:11:47 +0000 (03:11 +0000)]
Merge "Updating user restrictions when they are removed" into nyc-dev
Keisuke Kuroyanagi [Wed, 25 May 2016 02:11:26 +0000 (02:11 +0000)]
Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
am:
edebcae978
* commit '
edebcae9781fa897914952e9346a14afd2e08967':
Set input method mode for CascadingMenuPopup.
Change-Id: I117ea7e9b00fdd8eb26fd761a23925909318a12e
Keisuke Kuroyanagi [Wed, 25 May 2016 02:06:24 +0000 (02:06 +0000)]
Merge "Set input method mode for CascadingMenuPopup." into nyc-dev
Doris Liu [Wed, 25 May 2016 01:47:30 +0000 (01:47 +0000)]
Merge "Clamp start delay to non-negative range" into nyc-dev
am:
54d89e078d
* commit '
54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
Clamp start delay to non-negative range
Change-Id: I7cdb14821785d9d29d52b53ef2ff3567f07a3651
Doris Liu [Wed, 25 May 2016 01:41:11 +0000 (01:41 +0000)]
Merge "Clamp start delay to non-negative range" into nyc-dev
Hugo Benichi [Tue, 24 May 2016 02:50:31 +0000 (11:50 +0900)]
Fix default network transition event recording
When disconnecting from a default network X and falling back on another
connected network Y as the new default, ConnectivityService was
attempting to record this event as a X -> Y "atomic" transition.
In practice the default network connectivity is actually lost and
recovering default network takes some non-zero time.
This patch changes the event recording to always record disconnection as
X -> 0 events. At the same time, if there is a fallback network that is
elected as the new default ConnectivityService will also record a 0 -> Y
event.
This patch also improves pretty-printing of DefaultNetworkEvent.
Extract from $ adb shell dumpsys connectivity_metrics_logger --events
17:51:00.086: DefaultNetworkEvent(0 -> 100:CELLULAR)
17:51:25.232: DefaultNetworkEvent(100:IPv4 -> 101:WIFI) # wifi goes on
17:51:44.064: DefaultNetworkEvent(101:DUAL -> 0) # wifi goes off
17:51:44.187: DefaultNetworkEvent(0 -> 100:CELLULAR)
Bug:
28204408
Change-Id: I63252633235bf6ba833b9ac431a80dda75a93e67
Chet Haase [Wed, 25 May 2016 01:02:41 +0000 (01:02 +0000)]
Merge "Remove hidden LocaleList default constructor" into nyc-dev
am:
ba2cc82399
* commit '
ba2cc82399b89d92f766bbee3b2504a5cdf56215':
Remove hidden LocaleList default constructor
Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
Chet Haase [Wed, 25 May 2016 00:57:40 +0000 (00:57 +0000)]
Merge "Remove hidden LocaleList default constructor" into nyc-dev
Selim Cinek [Wed, 25 May 2016 00:37:40 +0000 (00:37 +0000)]
Merge "Fixed a few battery issues in SystemUI" into nyc-dev
am:
8fba3b395f
* commit '
8fba3b395fe45510683ffc199a0101655274ee45':
Fixed a few battery issues in SystemUI
Change-Id: Ieb5bf24c13004fc97bb1006494e915924f54c02c
Selim Cinek [Wed, 25 May 2016 00:30:45 +0000 (00:30 +0000)]
Merge "Fixed a few battery issues in SystemUI" into nyc-dev
Jim Miller [Wed, 25 May 2016 00:18:59 +0000 (00:18 +0000)]
Merge "resolve merge conflicts of
f950ec9 to nyc-dev" into nyc-dev
am:
0db3ad2410
* commit '
0db3ad24100e21d1a6bd2e6fb6cf1cdd67d02e47':
Fix missing permission check when saving pattern/password
Change-Id: Iec05d3688aa270cfa6fa8ead54fd1a933591786d
Pavlin Radoslavov [Wed, 25 May 2016 00:18:53 +0000 (00:18 +0000)]
Merge "Add missing "try ... finally" safeguards" into nyc-dev
am:
0810732a2a
* commit '
0810732a2affee7264d12b73fbcfa82d0db991b4':
Add missing "try ... finally" safeguards
Change-Id: I227ab98f33c025543e4ac4adf16453acd6159713
Dianne Hackborn [Wed, 25 May 2016 00:18:45 +0000 (00:18 +0000)]
Merge "Fix issue #
28931042: wtf in system server" into nyc-dev
am:
7a1aa92610
* commit '
7a1aa926109b090251d193426ba9fdc699e6f3b7':
Fix issue #
28931042: wtf in system server
Change-Id: I84142fe627ae93b680577bff91327419715db4bb
Dianne Hackborn [Wed, 25 May 2016 00:18:37 +0000 (00:18 +0000)]
Merge "Fix issue #
28931042: wtf in system server" into nyc-dev
am:
ae02bfdd28
* commit '
ae02bfdd289f7172faeb57664ef47de8b547fa05':
Fix issue #
28931042: wtf in system server
Change-Id: I0b15977a1b4e79743a6fe6937cd3463a4e3c2c3c
Ta-wei Yen [Wed, 25 May 2016 00:13:05 +0000 (00:13 +0000)]
Merge "Switch VVM SMS filter to Builder pattern" into nyc-mr1-dev
Daniel Nishi [Wed, 25 May 2016 00:10:55 +0000 (00:10 +0000)]
Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev
Doris Liu [Tue, 24 May 2016 23:38:19 +0000 (16:38 -0700)]
Clamp start delay to non-negative range
Bug:
28936388
Change-Id: I2a225e07cad53c6ffc3637219f8c741aca5c008c
Jim Miller [Wed, 25 May 2016 00:09:45 +0000 (00:09 +0000)]
Merge "resolve merge conflicts of
f950ec9 to nyc-dev" into nyc-dev
OSDN Git Service
