Commit Graph

8445 Commits

Author SHA1 Message Date
Jorim Jaggi
3c45bc6fde Merge "Remove optimization to report config change" into nyc-dev am: df551dda12 am: 1ef9359662
am: 54423e2947

* commit '54423e2947a8e0219aeb7cabb4c03111b56745b5':
  Remove optimization to report config change

Change-Id: I51cc7d3ce50bac4c46d12eefc74cfba798a14acc
2016-04-28 20:38:32 +00:00
Jorim Jaggi
1ef9359662 Merge "Remove optimization to report config change" into nyc-dev
am: df551dda12

* commit 'df551dda1289598c209d75f6b99322e82866e2c0':
  Remove optimization to report config change

Change-Id: Ida68bae850d55f3feb59c596bdef3e5d48e67b77
2016-04-28 20:32:52 +00:00
Jorim Jaggi
df551dda12 Merge "Remove optimization to report config change" into nyc-dev 2016-04-28 20:28:38 +00:00
Jeff Sharkey
23d8cb4a25 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae am: 35c6f6c70a
am: c68126587a

* commit 'c68126587aab22d27cf6ad19a05cb58b5d1bad50':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: I9a24147c091c7f370923e43148b78a855fcb43be
2016-04-28 19:33:53 +00:00
Jeff Sharkey
c68126587a Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev am: 8c2fb9edae
am: 35c6f6c70a

* commit '35c6f6c70a22987d0166500909f21d4d339dd1ae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ic288860b8edc814830fce958bbe2b0e93acecd78
2016-04-28 19:25:31 +00:00
Jeff Sharkey
065be97490 Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev
am: 8c2fb9edae

* commit '8c2fb9edae4413074186e3d84ccff0eba41b2cae':
  Introduce "unlocking" vs "unlocked" nuance.

Change-Id: Ibc26a4ee84531976e72cc30f2c2862be9a30d28b
2016-04-28 19:24:58 +00:00
TreeHugger Robot
8c2fb9edae Merge "Introduce "unlocking" vs "unlocked" nuance." into nyc-dev 2016-04-28 19:06:28 +00:00
Jeff Sharkey
ce18c81677 Introduce "unlocking" vs "unlocked" nuance.
There is a narrow window of time during user unlock where we're
reconciling user storage and dispatching the "unlock" status to
various internal system services.  While in this "unlocking" state,
apps need to be told that the user still isn't actually "unlocked"
so they don't try making calls to AccountManager, etc.

The majority of internal services are interested in merging together
both the "unlocking" and "unlocked" state, so update them.

Clarify naming in AccountManagerService to make it clear that a local
list is being used, which mirrors the naming in MountService.

To match UX/PM requested behavior, move PRE_BOOT_COMPLETED dispatch
after the user is unlocked, but block BOOT_COMPLETED dispatch until
after all PRE_BOOT receivers are finished to avoid ANRs.

Bug: 28040947, 28164677
Change-Id: I57af2351633d9159f4483f19657ce0b62118d1ce
2016-04-28 10:51:39 -06:00
Alex Hills
ffb555b039 Merge "Move allowGeneratedReplies to Action" into nyc-dev am: 9de0f87 am: 2a1a315
am: 76a560c

* commit '76a560cab14a08beac287f2f02139f7c6dc962d2':
  Move allowGeneratedReplies to Action

Change-Id: I10055fa54d58f86bb186ff249de587e08d6d9d7f
2016-04-28 13:54:08 +00:00
Alex Hills
2a1a315713 Merge "Move allowGeneratedReplies to Action" into nyc-dev
am: 9de0f87

* commit '9de0f87e9708f86b46a3c38d4d091c2bc1ba9885':
  Move allowGeneratedReplies to Action

Change-Id: Ic391eb188644107aaa3401bf2a7d64f6ce867a76
2016-04-28 13:46:34 +00:00
TreeHugger Robot
9de0f87e97 Merge "Move allowGeneratedReplies to Action" into nyc-dev 2016-04-28 13:41:49 +00:00
Jorim Jaggi
2f5e3ddf9e Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8 am: 1601067
am: 4398aad

* commit '4398aad9542ff58df6ac2aa38f5e31f18021a306':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib5a88c47ef73b461fb1d09b45e4763b0d6512666
2016-04-28 05:30:56 +00:00
TreeHugger Robot
4398aad954 Merge changes Idb555b01,If8acf31b into nyc-dev am: 831ecc8
am: 1601067

* commit '16010672874c7fbacd248c87a31396f7d8222334':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ifa8fb6f3c0c98a74b959be82a523dd4987a0d9d5
2016-04-28 05:28:00 +00:00
Jorim Jaggi
c880a803d1 Merge changes Idb555b01,If8acf31b into nyc-dev
am: 831ecc8

* commit '831ecc81f982282bdcc2121c2fa3ece22ac997e0':
  Show forced resizable based on top activity
  Don't move forced resizable info activity to the front

Change-Id: Ib61028c751a31b437fb459bd094c2fedadd40abe
2016-04-28 05:25:19 +00:00
Jorim Jaggi
1793d4769b Remove optimization to report config change
Since activity manager only issues a configuration change when
we are not relaunching the activity, the optimization to suppress
that on the client side is not needed anymore and only leads to
issues where there is a change in smallest_width but we are not
relaunching the activity because the change doesn't cross a size
threshold.

Bug: 28050773
Change-Id: I303c190bd7390363d1030edcdb2913b7c64c666d
2016-04-27 20:59:40 -07:00
Jorim Jaggi
c875ae74ba Don't move forced resizable info activity to the front
If we start the forced resizable activity with an existing task,
avoid moving that task to the front. This can cause that a previous
task that was moved to the back gets moved to the front again just
because we started that activity. That's not good.

Bug: 28223489
Change-Id: If8acf31b8be98b82665de1015d5621331c37fb64
2016-04-27 19:19:04 -07:00
Adrian Roos
689e06f392 Merge "Fix MessagingStyle HUNs" into nyc-dev am: 5aa8e7d am: 4dd8578
am: 1732ce4

* commit '1732ce493f6c0b8977558bef1885b1ecc8841f18':
  Fix MessagingStyle HUNs

Change-Id: I649b4fc0336abe2aedbc185f77afb68755a5b5b1
2016-04-28 00:57:18 +00:00
Selim Cinek
94cc8e64cb Merge "Handle empty bigTexts more gracefully" into nyc-dev am: 1689203 am: b12c2e9
am: ad4b7f0

* commit 'ad4b7f0f81e4b9ff0d458000efcbe4ad008d13ad':
  Handle empty bigTexts more gracefully

Change-Id: Ic7f71f14142d51fb33b7fc3d4f5609e27f42c3e3
2016-04-28 00:53:54 +00:00
Adrian Roos
4dd85783ca Merge "Fix MessagingStyle HUNs" into nyc-dev
am: 5aa8e7d

* commit '5aa8e7d1f12f78dde892bdc6698550e8d1c558c4':
  Fix MessagingStyle HUNs

Change-Id: Ia69ff8eb3ab8a650af205b17e8f64bc877b7df64
2016-04-27 23:32:18 +00:00
Selim Cinek
b12c2e98e9 Merge "Handle empty bigTexts more gracefully" into nyc-dev
am: 1689203

* commit '1689203d5cc33c2490169d7998cf3ffbeb5d35fc':
  Handle empty bigTexts more gracefully

Change-Id: I3e81fdf19cdb4dd9a81e7cd1e1fd61769de0fdf1
2016-04-27 23:31:59 +00:00
Adrian Roos
975c918d24 Merge "Fix remote input view clobbering" into nyc-dev
am: 1a101db

* commit '1a101dbc81151942eafaa95762c2e3fd53ceb05f':
  Fix remote input view clobbering

Change-Id: I5166a5594e846576f395031978490be5aa412cd9
2016-04-27 23:31:30 +00:00
Adrian Roos
30ae27011b Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db am: 326475cd
am: d8053d0

* commit 'd8053d042a108a471bc4dc632af8a107575d98d2':
  Fix remote input view clobbering

Change-Id: Ifd5054cb7455ffa0cce94e405e1bf726fe8ccb57
2016-04-27 23:26:16 +00:00
Robert Carr
835eb2c0ad Merge "Fix crash when docking." into nyc-dev am: 45ee78c am: 6ad9739
am: 88df0dd

* commit '88df0dd3efeba73dda2d436fdb93d3e4ebe88765':
  Fix crash when docking.

Change-Id: Iae8e8801ab0e237dd25c26854588020778ce74f8
2016-04-27 23:24:55 +00:00
Adrian Roos
5aa8e7d1f1 Merge "Fix MessagingStyle HUNs" into nyc-dev 2016-04-27 23:17:08 +00:00
Selim Cinek
1689203d5c Merge "Handle empty bigTexts more gracefully" into nyc-dev 2016-04-27 22:59:03 +00:00
TreeHugger Robot
d8053d042a Merge "Fix remote input view clobbering" into nyc-dev am: 1a101db
am: 326475cd

* commit '326475cdb42b7b50ff80e175b450cd43af531924':
  Fix remote input view clobbering

Change-Id: Ieb9b6490e115a5cb91059b0499d520a1e9b38035
2016-04-27 22:27:43 +00:00
TreeHugger Robot
1a101dbc81 Merge "Fix remote input view clobbering" into nyc-dev 2016-04-27 22:17:33 +00:00
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Robert Carr
6ad97390a3 Merge "Fix crash when docking." into nyc-dev
am: 45ee78c

* commit '45ee78c083906eca68cdade9bc98b64a83372307':
  Fix crash when docking.

Change-Id: Ic2de9854c107886f45024eb4bc620b07b1329a20
2016-04-27 22:06:54 +00:00
Antonio Cansado
b649d42ecf Merge "Fixing network tags." into nyc-dev am: 2c9bb7c
am: 72baa83

* commit '72baa83895fa35be96b8dd2f5f5ac4cbdd5c2795':
  Fixing network tags.

Change-Id: I9fc3fb5a2288a2b90132fcf5cd4576000ba5f1c9
2016-04-27 21:59:13 +00:00
Antonio Cansado
79335ba880 Merge "Fixing network tags." into nyc-dev
am: 2c9bb7c

* commit '2c9bb7c09a49442ac871115890f93581aa160d46':
  Fixing network tags.

Change-Id: Ie90d6886bde2182ac81ad1b26bdec93a69565c56
2016-04-27 21:39:56 +00:00
Rob Carr
45ee78c083 Merge "Fix crash when docking." into nyc-dev 2016-04-27 21:36:53 +00:00
Antonio Cansado
2c9bb7c09a Merge "Fixing network tags." into nyc-dev 2016-04-27 21:28:13 +00:00
Jeff Sharkey
7fb24c7f68 Merge "Only log when system UID finds missing data paths." into nyc-dev am: 2c3f2c4
am: 70b58c4

* commit '70b58c4a3ee59bef623cd4bb3d5d10c165bf517d':
  Only log when system UID finds missing data paths.

Change-Id: Idc2531e10088ee0859d6af2213e28a4c7f075cf7
2016-04-27 20:51:55 +00:00
Selim Cinek
7599878c8a Handle empty bigTexts more gracefully
We're now falling back to the normal text if the bigtext is empty

Bug: 28318145
Change-Id: I5da237780407b62d21f79f7a754736ae1e4a8785
2016-04-27 13:44:13 -07:00
Jeff Sharkey
6ed8ae5ec4 Merge "Only log when system UID finds missing data paths." into nyc-dev
am: 2c3f2c4

* commit '2c3f2c4da90613bafc93ed34e53867da10084212':
  Only log when system UID finds missing data paths.

Change-Id: I90b8fe98181dc2b7d00f0c9d320acce316d637e9
2016-04-27 20:41:19 +00:00
Jeff Sharkey
2c3f2c4da9 Merge "Only log when system UID finds missing data paths." into nyc-dev 2016-04-27 20:34:19 +00:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 20:32:26 +00:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
2016-04-27 13:16:17 -07:00
Jeff Hao
6fdf5951ae Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
am: 864bc48

* commit '864bc48e0104451e20281258429677a9ebbab9ac':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Ia276b7594e31177f0295e03982aae96267367887
2016-04-27 20:02:24 +00:00
Robert Carr
311ecba981 Fix crash when docking.
ViewRootImpl may be null at this point if
we didn't preserve. Sorry about the churn.

Bug: 28413589
Change-Id: Iebfd819490252b52332d94ccefbddfae160087cf
2016-04-27 12:59:45 -07:00
Jeff Hao
864bc48e01 Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev 2016-04-27 19:54:04 +00:00
Adam Powell
b5a40d542a Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev am: 596a4a1 am: dd58799
am: ce09139

* commit 'ce091392274585a897e489ed7b49e82ee222f0cc':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: Idb5c97da8760792598a2d78be05b624f120cc6c7
2016-04-27 19:30:48 +00:00
Adam Powell
dd587993ae Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
am: 596a4a1

* commit '596a4a1592a8f5e7b708d884145e280df9b638d0':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: I635309e5b37dfca8befdadeb578a71ae1619ac00
2016-04-27 19:18:31 +00:00
TreeHugger Robot
596a4a1592 Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev 2016-04-27 19:12:51 +00:00
Dimitry Ivanov
b1ef62bb38 Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777fa6)
2016-04-27 11:38:41 -07:00
Jeff Sharkey
21f507274b Only log when system UID finds missing data paths.
We're really only interested in tracking down when the system UID
tries touching missing data paths, since it's the only one with enough
permissions to mkdirs() directly without going through installd.

Without the guard added in this CL, we'd end up logging for direct
boot aware apps that tried obtaining CE paths while locked, which is
perfectly valid.

Bug: 28272737
Change-Id: Id24f3160f61d8ad8047d5c551bc6a91c868bd301
2016-04-27 12:38:20 -06:00
Dimitry Ivanov
fa8b96c6c1 Merge changes from topic \'target-sdk-0-fix\'
am: 493576b

* commit '493576bc5db94068b5a767021a4a5c8b6963c836':
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class

Change-Id: Ifbebd0a98c3d80620b53bf7ebef76222e57ca923
2016-04-27 18:33:55 +00:00
Jeff Hao
c7b9482b0c Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306

(cherry-picked from 7b331b6a8a)

Change-Id: I523b1b74775e7ed27072498509e743f1f10b1164
2016-04-27 11:11:17 -07:00
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +00:00