Commit Graph

59497 Commits

Author SHA1 Message Date
Alan Viverette
75dfc87e5e Merge "Use ICU\'s Calendar class in date picker & related classes" into nyc-dev am: cfbca5640c
am: b9878f0c5a

* commit 'b9878f0c5aab4b540180fb7e36a8e0b41b5e50c2':
  Use ICU's Calendar class in date picker & related classes

Change-Id: I6c9f2c9208cb46ccb4e83f196dfa8ff8ae5ec710
2016-05-25 16:46:59 +00:00
Alan Viverette
b9878f0c5a 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
2016-05-25 16:24:51 +00:00
Alan Viverette
cfbca5640c Merge "Use ICU's Calendar class in date picker & related classes" into nyc-dev 2016-05-25 16:20:16 +00:00
Alan Viverette
68763be41c Use ICU's Calendar class in date picker & related classes
Also organizes imports.

Bug: 28756630
Change-Id: I4e59c4b35c88edd94ff4b2945ad9feb2a4bd0022
2016-05-25 11:42:42 -04:00
Ricky Wai
cdb948c81c Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd
am: 2281b83051

* commit '2281b83051f8f2d14dfc0a366ed54b1716370412':
  Do not allow DPM.resetPassword() when child profile exists or user is locked

Change-Id: Ia43caa8b23eced60a8ef187ed100b106aedb74a3
2016-05-25 13:23:24 +00:00
Ricky Wai
2281b83051 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: If87e0c523af3fdbd5d0f0182037fba0758cb4cfb
2016-05-25 13:15:33 +00:00
Ricky Wai
fdf928d4b5 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
2016-05-25 13:14:23 +00:00
Ricky Wai
977ade26dd Do not allow DPM.resetPassword() when child profile exists or user is locked
Bug: 28878708
Change-Id: Iaae2a9ba9c7c0ff388264c474c78a0dcd9fec258
2016-05-25 13:09:44 +00:00
Yohei Yukawa
e5befc5221 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev am: 50c33d1ca1
am: ef68474698

* commit 'ef684746980061bb5950ae2505229648d9f146d6':
  Make IMM more robust to spurious window focus-in

Change-Id: I77ae5953aa9afc64ef1cd3252d6d2ff936890b62
2016-05-25 05:02:09 +00:00
Yohei Yukawa
ef68474698 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: I1d9a138798d982f2164907b49713a7b90cec9adc
2016-05-25 04:58:20 +00:00
Yohei Yukawa
e8ae33f6e6 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
2016-05-25 04:57:43 +00:00
Yohei Yukawa
50c33d1ca1 Merge "Make IMM more robust to spurious window focus-in" into nyc-dev 2016-05-25 04:47:31 +00:00
Seigo Nonaka
48cb2ee07b Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev am: 7c8305bcfe
am: 7b77768d39

* commit '7b77768d39fdc1de95bbf32a809b52eb26c9e10d':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Iadf842b82cb178bcaf69c7790051ae3f17b5bd34
2016-05-25 03:37:22 +00:00
Hugo Benichi
06facea297 Merge "Fix default network transition event recording" into nyc-dev am: 9d4e66ece6
am: bfbf55fcbd

* commit 'bfbf55fcbd5cbd347642023ab46b22d114f22592':
  Fix default network transition event recording

Change-Id: Ife822c39d617f89dde4cda5f2137b80425fe89ad
2016-05-25 03:37:19 +00:00
Seigo Nonaka
7b77768d39 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: Ib724b88ace6e27a499578c473acfd2a909f62068
2016-05-25 03:31:38 +00:00
Hugo Benichi
bfbf55fcbd Merge "Fix default network transition event recording" into nyc-dev
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e
2016-05-25 03:31:34 +00:00
Seigo Nonaka
9995396b26 Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev
am: 7c8305bcfe

* commit '7c8305bcfeef206e8bd00f20077f8106bb66fa6b':
  Use original theme for SuggestsionsPopupWindow

Change-Id: I77ed2205c4dc34786c1b931a00f64187a878395e
2016-05-25 03:30:06 +00:00
Hugo Benichi
6a63f7b496 Merge "Fix default network transition event recording" into nyc-dev
am: 9d4e66ece6

* commit '9d4e66ece64f6b65d8a902a6f03f945a0fe88868':
  Fix default network transition event recording

Change-Id: Ie025342be8e13bfd1d3f4b45d522cc30b56ef606
2016-05-25 03:29:59 +00:00
Seigo Nonaka
7c8305bcfe Merge "Use original theme for SuggestsionsPopupWindow" into nyc-dev 2016-05-25 03:24:11 +00:00
Hugo Benichi
9d4e66ece6 Merge "Fix default network transition event recording" into nyc-dev 2016-05-25 03:22:32 +00:00
Doris Liu
a38cbfbd1f Merge "Clamp start delay to non-negative range" into nyc-dev am: 54d89e078d
am: 0890a4708e

* commit '0890a4708efa987322b13ab26e0e499cdb4d789d':
  Clamp start delay to non-negative range

Change-Id: Ib71346f153430ea108797dcefd4c16b3c2cac0b9
2016-05-25 01:52:12 +00:00
Doris Liu
0890a4708e 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
2016-05-25 01:47:30 +00:00
Doris Liu
8147618d3f Merge "Clamp start delay to non-negative range" into nyc-dev
am: 54d89e078d

* commit '54d89e078d4a4abd6a06362c04f3329fdebd6d7b':
  Clamp start delay to non-negative range

Change-Id: Ifd52004a9ea7eca581ab63d13c879f3717339429
2016-05-25 01:47:12 +00:00
Doris Liu
54d89e078d Merge "Clamp start delay to non-negative range" into nyc-dev 2016-05-25 01:41:14 +00:00
Chet Haase
e8de8b7a3b Merge "Remove hidden LocaleList default constructor" into nyc-dev am: ba2cc82399
am: f33737d646

* commit 'f33737d6463baad82681bf253419ac4fe25b4bf9':
  Remove hidden LocaleList default constructor

Change-Id: Ice64b7f61186ee03e1f41c7e40c0225ad71679fb
2016-05-25 01:06:33 +00:00
Hugo Benichi
1654b1d11c 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
2016-05-25 10:03:38 +09:00
Chet Haase
b1da0cf2e5 Merge "Remove hidden LocaleList default constructor" into nyc-dev
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ie4da3684f7045cc6439cc86d524e0b0ff1c6eaf7
2016-05-25 01:02:45 +00:00
Chet Haase
f33737d646 Merge "Remove hidden LocaleList default constructor" into nyc-dev
am: ba2cc82399

* commit 'ba2cc82399b89d92f766bbee3b2504a5cdf56215':
  Remove hidden LocaleList default constructor

Change-Id: Ia9416e9e318104dc0a29ce8b092036cf4d2b53a8
2016-05-25 01:02:41 +00:00
Chet Haase
ba2cc82399 Merge "Remove hidden LocaleList default constructor" into nyc-dev 2016-05-25 00:57:41 +00:00
Pavlin Radoslavov
2a206db284 Merge "Add missing "try ... finally" safeguards" into nyc-dev am: 0810732a2a
am: 505425c063

* commit '505425c0631585a943de164a051bb6a83fd1ffec':
  Add missing "try ... finally" safeguards

Change-Id: I65dd9d226f759b997e548186d5c3c8c85eb44da2
2016-05-25 00:24:32 +00:00
Pavlin Radoslavov
e818ac4abf Merge "Add missing "try ... finally" safeguards" into nyc-dev
am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I227ab98f33c025543e4ac4adf16453acd6159713
2016-05-25 00:18:53 +00:00
Daniel Nishi
15d6c4bf7c Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev
am: 9746deefbb

* commit '9746deefbbfa3f6561bdf27e7d697cc352853f13':
  Add a flag to toggle the automatic storage manager on and off.

Change-Id: Icd5688b8ea9c72c6bab9dbb0eedd895bd0b09aca
2016-05-25 00:18:39 +00:00
Pavlin Radoslavov
505425c063 Merge "Add missing "try ... finally" safeguards" into nyc-dev
am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I29408abab67992b5d33684254c1d7ea7abf34e33
2016-05-25 00:17:06 +00:00
Daniel Nishi
9746deefbb Merge "Add a flag to toggle the automatic storage manager on and off." into nyc-mr1-dev 2016-05-25 00:10:56 +00:00
Doris Liu
61045c518b Clamp start delay to non-negative range
Bug: 28936388
Change-Id: I2a225e07cad53c6ffc3637219f8c741aca5c008c
2016-05-25 00:10:25 +00:00
Yohei Yukawa
8e9214b4bd Make IMM more robust to spurious window focus-in
InputMethodManager (IMM) has a latch switch named IMM#mHasBeenInactive
to forcefully refresh IME focus state when an inactive client
(IMM#mActive == false) is gaining window focus.  However, it turns out
that there is a race condition where the latch could be unexpectedly
turned off. This is probably what we have been chasing in bug 25373872.

Imagine the following scenario:

  1. An app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=false
  2. IMM inside the app receives MSG_SET_ACTIVE w/ active=false
  3. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=true
  4. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=false
  5. The app receives MSG_WINDOW_FOCUS_CHANGED w/ hasWindowFocus=true

Here, our current strategy has been:
  A. Turn on the latch when MSG_SET_ACTIVE (w/active=false) is handled.
  B. Turn off the latch and ask IMMS to start input when
     MSG_WINDOW_FOCUS_CHANGED (w/ hasWindowFocus=true) is handled.

The problem is that in the step B IMMS can reject the request if
WindowManagerService (WMS) tells that the window in question no longer
has window focus. This is not surprising because the app is
just handling messages in the message queue sequentially.  As a result,
the IME focus is not updated expectedly in the step 5, because the latch
is no longer enabled as we expected.

With this CL, the latch will be re-enabled if the app fails to start
input while IMM#mActive is false as a short-term solution.

In future we may want to address this issue in protocol level so that
we can address other known issues such as bug 26851566 at the same time.

Bug: 28281870
Change-Id: I60adb38013b063918b074c7b947649eada77b2c8
2016-05-24 23:55:29 +00:00
Chet Haase
f3d5ec05b4 Remove hidden LocaleList default constructor
Previous change hid this constructor. Now removing it entirely for completeness.

Issue #28296200  API Review: LocaleList

Change-Id: I43476994070b101999d338ec1f5d1a1a0a2a7658
2016-05-24 16:07:00 -07:00
Pavlin Radoslavov
e957a8a0b4 Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.

Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
2016-05-24 22:57:14 +00:00
Johan T. Halseth
df296a7e68 Merge "Adding grantPermission for packageName" into nyc-mr1-dev
am: b1f0e9705d

* commit 'b1f0e9705d253350852d6508878b4782578fbda6':
  Adding grantPermission for packageName

Change-Id: I59b23547464b776977b69ffba1ad544fc124ef0e
2016-05-24 22:03:56 +00:00
Johan Torås Halseth
b1f0e9705d Merge "Adding grantPermission for packageName" into nyc-mr1-dev 2016-05-24 21:58:00 +00:00
Tianjie Xu
375a512c0d Merge "Report OTA time statistics" into nyc-dev am: 86f97177e9
am: 7135fab76c

* commit '7135fab76cb3e7f7a68547794b3ddf54f08facca':
  Report OTA time statistics

Change-Id: I82f174bfa383a26a87d45ac6675a3ae5812b50af
2016-05-24 21:47:52 +00:00
Adam Lesinski
9ed84d8612 Merge "Improve performance of LocaleList with Resources" into nyc-dev am: bb26248bbb
am: 5e106dea45

* commit '5e106dea4545547f3f7c50dad30f792809659b96':
  Improve performance of LocaleList with Resources

Change-Id: I733cdad0b30069ac7830fa91ef0188dd0f0cfac9
2016-05-24 21:41:20 +00:00
Tianjie Xu
acf91cd6c5 Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I271c156232c49a861579acd9ce90c91fbc7e5a4f
2016-05-24 21:41:06 +00:00
Tianjie Xu
7135fab76c Merge "Report OTA time statistics" into nyc-dev
am: 86f97177e9

* commit '86f97177e959cb40229010b90f066fd602d6a06f':
  Report OTA time statistics

Change-Id: I941b48f287fe72dbb3e0f61ccdea33deab3c34c5
2016-05-24 21:41:05 +00:00
Adam Lesinski
5e106dea45 Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: Ic43a26915a28d71a967eb038331a0f3c31bdfe8f
2016-05-24 21:35:56 +00:00
Tianjie Xu
86f97177e9 Merge "Report OTA time statistics" into nyc-dev 2016-05-24 21:35:25 +00:00
Adam Lesinski
5e5e871fdc Merge "Improve performance of LocaleList with Resources" into nyc-dev
am: bb26248bbb

* commit 'bb26248bbba6e4014ea89a97b86618b7289a5f29':
  Improve performance of LocaleList with Resources

Change-Id: I307b4a7c78ff04797fda041afa8106b082951bc9
2016-05-24 21:34:48 +00:00
Johan T. Halseth
244259a063 Adding grantPermission for packageName
Adding a hidden API in UsbManager for system services to grant
permissions to a specific package for a USB device without showing a
user dialog.

Bug: 28760255
Change-Id: Ie68cfc784b7894e9db12ab61bab0f7e6bfa369e3
2016-05-24 22:34:35 +01:00
Adam Lesinski
bb26248bbb Merge "Improve performance of LocaleList with Resources" into nyc-dev 2016-05-24 21:25:41 +00:00
Mady Mellor
a016449a83 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964
am: 12021f5020

* commit '12021f5020a057b3c0be8643bf5a8a999f488732':
  Children should have backgrounds

Change-Id: I5343b9b9aa4fb6c5e1f343cf5f4927c44bd5489d
2016-05-24 21:13:25 +00:00