Commit Graph

249922 Commits

Author SHA1 Message Date
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
Pavlin Radoslavov
153811d74a resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp
Change-Id: I216125254d09cf00a60274f510f814ee8f1a31ba
2016-05-24 18:36:00 -07:00
Pavlin Radoslavov
3ef690cd7f Merge "Add missing "try ... finally" safeguards"
am: 47ae606d2c

* commit '47ae606d2c7b642e559527f1f6ff175ae9b29de1':
  Add missing "try ... finally" safeguards

Change-Id: I4d15b25f3e72d26c6a8efae21b8952ab72203a1d
2016-05-25 01:14:20 +00:00
Treehugger Robot
47ae606d2c Merge "Add missing "try ... finally" safeguards" 2016-05-25 01:07:47 +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
ba2cc82399 Merge "Remove hidden LocaleList default constructor" into nyc-dev 2016-05-25 00:57:41 +00:00
Selim Cinek
564621ecb2 Merge "Fixed a few battery issues in SystemUI" into nyc-dev
am: 8fba3b395f

* commit '8fba3b395fe45510683ffc199a0101655274ee45':
  Fixed a few battery issues in SystemUI

Change-Id: Ic2bb6e80c8276b2029b26095514d1aeb37bbeedb
2016-05-25 00:38:02 +00:00
Selim Cinek
8fba3b395f Merge "Fixed a few battery issues in SystemUI" into nyc-dev 2016-05-25 00:30:46 +00:00
Jim Miller
97fb2690c4 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: I76b097259a3bd072536b69476da7ef36b3b73de4
2016-05-25 00:17:09 +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
Dianne Hackborn
9bebd9edb0 Merge "Fix issue #28931042: wtf in system server" into nyc-dev
am: 7a1aa92610

* commit '7a1aa926109b090251d193426ba9fdc699e6f3b7':
  Fix issue #28931042: wtf in system server

Change-Id: Ifc7c884f7fe54f4b4d9d0769c1a0af1b9f6f2e0b
2016-05-25 00:17:02 +00:00
Dianne Hackborn
3f2704b112 Merge "Fix issue #28931042: wtf in system server" into nyc-dev
am: ae02bfdd28

* commit 'ae02bfdd289f7172faeb57664ef47de8b547fa05':
  Fix issue #28931042: wtf in system server

Change-Id: I24ca8dbb0f9935651fbeaf84b58407eb05abc064
2016-05-25 00:16:57 +00:00
Pavlin Radoslavov
9a69daa706 Add missing "try ... finally" safeguards
Safeguards for code protected by ReentrantReadWriteLock.

Bug: 28734075
Bug: 28799467
Change-Id: Ib7f598a92e8df6bd855ca48cdd094c1c73a935f2
(cherry picked from commit e957a8a0b4)
2016-05-24 17:14:51 -07:00
Doris Liu
61045c518b Clamp start delay to non-negative range
Bug: 28936388
Change-Id: I2a225e07cad53c6ffc3637219f8c741aca5c008c
2016-05-25 00:10:25 +00:00
Jim Miller
0db3ad2410 Merge "resolve merge conflicts of f950ec9 to nyc-dev" into nyc-dev 2016-05-25 00:09:46 +00:00
TreeHugger Robot
0810732a2a Merge "Add missing "try ... finally" safeguards" into nyc-dev 2016-05-25 00:09:29 +00:00
Dianne Hackborn
7a1aa92610 Merge "Fix issue #28931042: wtf in system server" into nyc-dev 2016-05-25 00:00:07 +00:00
Eric Schmidt
22f5dd2372 docs: Instant Apps broken link, wonky video thumbnail
Bug: 28861513
Bug: 28842359
Change-Id: I8c90d3131f614727a96937702f062a95f998047a
2016-05-24 16:56:45 -07: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
Selim Cinek
5f56d85552 Fixed a bug where the expand button was invisible
Since the view wasn't layouted yet it was layouting it wrongly

Change-Id: I62fcdde1eda457bab74765a290865b1749b08dac
Fixes: 28869354
2016-05-24 16:55:13 -07:00
Suprabh Shukla
64e0dcb989 Updating user restrictions when they are removed
Local user restrictions were not being updated in
AppOpsService#setUserRestrictions when a restriction was removed.

Bug: 28908581
Change-Id: If22f5834fadca33ec8b80bc4fb3993c1e1c29824
2016-05-24 16:47:41 -07:00
Adam Powell
143bf5b0f7 Update preloaded drawables
Remove holo assets and add all material assets referred to through
styles.

Bug 28729750

Change-Id: I34aac1ac55d087ac60f12c2954e612072a93366b
2016-05-24 16:39:16 -07:00
Chong Zhang
f58631a6a2 Destroy saved surfaces if one of the last visible windows gets removed
Also, if by the time the app is closing, a window is still invisible
in layout (or is already removed), mark the window as mAnimatingExit,
so that the surface is destroyed (or saved again). If it's marked
for removal, the window gets removed as well.

bug: 28913302
Change-Id: Ifa3dc0742f9c8c09d741fd64dcdc01b49075628c
2016-05-24 16:28:25 -07:00
Pavlin Radoslavov
e1a60983da Merge "Reduced the impact of "synchronized" statements"
am: 1c3b50a00e

* commit '1c3b50a00ea3ab23569a697ba1f1e756098a01a2':
  Reduced the impact of "synchronized" statements

Change-Id: I7ddeb85696efe31c52db3a97ec2a142cb03bee65
2016-05-24 23:25:03 +00:00
Dianne Hackborn
ae02bfdd28 Merge "Fix issue #28931042: wtf in system server" into nyc-dev 2016-05-24 23:23:35 +00:00
Treehugger Robot
1c3b50a00e Merge "Reduced the impact of "synchronized" statements" 2016-05-24 23:17:36 +00:00
Jim Miller
18347a3289 resolve merge conflicts of f950ec9 to nyc-dev
Change-Id: I131632cb9d64156d10001b3555e8b3bfa471690d
2016-05-24 16:08:15 -07: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
Sid Soundararajan
4771bc84d8 Merge "Add support for dismissing in Talkback Mode" into nyc-dev
am: a3cb77a9b4

* commit 'a3cb77a9b451b1c02e668024a6a8e3b779a7781d':
  Add support for dismissing in Talkback Mode

Change-Id: I0bd9c14ce2c9537df981688eaa87f277cf72a5f3
2016-05-24 22:53:05 +00:00
Sid Soundararajan
a3cb77a9b4 Merge "Add support for dismissing in Talkback Mode" into nyc-dev 2016-05-24 22:46:27 +00:00
Dianne Hackborn
a8e6f875bc Fix issue #28931042: wtf in system server
More broadcasts (from telephony) that should be protected.

Also put a little more information in the wtf message to
help determine where broadcasts from out of the system process
are coming from.

Change-Id: Ie3df25c883482ca54c7a7c5db57ca609950f5cbc
2016-05-24 15:35:27 -07:00
Jim Miller
f950ec9b1a Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a am: 9bf8474c27
am: 89e3f2ba98

* commit '89e3f2ba98ea6d69b1846e996c4c279a9b20c4e9':
  Fix missing permission check when saving pattern/password

Change-Id: Ice157c9ee86cf29380766d3ec266cb57594a5868
2016-05-24 22:20:09 +00:00
Jim Miller
89e3f2ba98 Merge "Fix missing permission check when saving pattern/password" into mnc-dev am: 45c77d951a
am: 9bf8474c27

* commit '9bf8474c27642f48aa27e2edf1bdd83b27d692c1':
  Fix missing permission check when saving pattern/password

Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e
2016-05-24 22:14:24 +00:00
Jim Miller
9bf8474c27 Merge "Fix missing permission check when saving pattern/password" into mnc-dev
am: 45c77d951a

* commit '45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
  Fix missing permission check when saving pattern/password

Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0
2016-05-24 22:08:16 +00:00
John Reck
c9bb1a38d3 Fix a translate issue with saveLayer
Bug: 28667141

saveLayer clips the layer to the size it needs to
be and will translate content if necessary, but
the drawLayerOp that results from that was not
translated to handle the shifted draw content.

This fixes that

Change-Id: I3c9ffd5d0282fa1b958bced94c25e9744281e9be
2016-05-24 15:06:01 -07:00
Jim Miller
45c77d951a Merge "Fix missing permission check when saving pattern/password" into mnc-dev 2016-05-24 22:04:37 +00:00
Mady Mellor
f229d406d0 Fix clipping not being activated on children in groups
Some views were not getting the call to reactivate clipping
this is because only the when the view was made visible
was it reset, views made invisible would be missed.

Fixes: 27364129
Change-Id: Ie6944569f432cd657f7f741c95c4067b346ea98b
2016-05-24 15:01:22 -07:00
Amith Yamasani
b396f36bc3 Merge "Don\'t deliver broadcast to apps that are being backed up" into nyc-dev
am: fc2a7ce7ac

* commit 'fc2a7ce7acc5ede8b26f35819c8287df1fed135c':
  Don't deliver broadcast to apps that are being backed up

Change-Id: I531ddd28dd24ff567814cb455059ca9ddb24f145
2016-05-24 21:55:01 +00:00
Amith Yamasani
fc2a7ce7ac Merge "Don't deliver broadcast to apps that are being backed up" into nyc-dev 2016-05-24 21:43:53 +00:00
Dianne Hackborn
a8c16935d9 Fix issue #28931042: wtf in system server
Broadcast needs to have a valid action.  We'll just pick
a generic one, since the receiver here doesn't care.

Change-Id: Ifff87626d11dd9fafb4e68819e8c8cecdf7fe1aa
2016-05-24 14:43:47 -07: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
Allen Hair
79f42608c2 Merge "Deprecate shell-based UI Automator." into nyc-dev
am: f298f4a7c7

* commit 'f298f4a7c779588821b744c7247fc896541cae57':
  Deprecate shell-based UI Automator.

Change-Id: I0f8f99ddc4dd1048a84ab9f6f7edc19d923c7a75
2016-05-24 21:36:20 +00:00
Amanda Kassay
38ffaa1c51 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d am: 5a00e9d345
am: 0a6d5112f1

* commit '0a6d5112f1c0f0574ecf62b440541fca4736a706':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: Ic7898fd17a5b3ce47a3dc67364635e33436b97d2
2016-05-24 21:36:08 +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
Allen Hair
f298f4a7c7 Merge "Deprecate shell-based UI Automator." into nyc-dev 2016-05-24 21:29:45 +00:00
Amanda Kassay
0a6d5112f1 Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. am: 85b7df2697 am: e468c2380d
am: 5a00e9d345

* commit '5a00e9d3450e0baccc89a88e586f8ce558e14aac':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: I1d972ef1511ff8205ec54f1af7241db104ea976a
2016-05-24 21:28:50 +00:00