Commit Graph

58660 Commits

Author SHA1 Message Date
Adam Powell
1629a08fb9 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev am: e60b8f8
am: 701bb7a

* commit '701bb7ae13879764b316918042fe8118664d73af':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: Ia089ebf5b2ba924ceb8e57132ed5c89b7211b8a5
2016-04-11 23:14:40 +00:00
Adam Powell
701bb7ae13 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev
am: e60b8f8

* commit 'e60b8f897065a9600058a7b958f1e0bcd198b0b5':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba
2016-04-11 23:09:36 +00:00
Adam Powell
e60b8f8970 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 2016-04-11 22:57:47 +00:00
Robert Greenwalt
7a05c769db Merge "Add settings for SUW data control." into nyc-dev am: 6e1e880
am: ad1f6a7

* commit 'ad1f6a7b0d3c1bad717118802b75a4d53479dbf0':
  Add settings for SUW data control.

Change-Id: I3ca7d49a6bab90778306d07d1c46a8f65c058e48
2016-04-11 21:40:54 +00:00
Greg Kaiser
925d91138b Merge "NanoApp: Make indentation consistent" into nyc-dev am: 7c0393a
am: c0b5c1c

* commit 'c0b5c1c89798233c7b6113e7ac6e4c2887bd5656':
  NanoApp: Make indentation consistent

Change-Id: I6de32ace7386c7afa8a01d98eeb89ea1b1d5468f
2016-04-11 21:40:51 +00:00
Robert Greenwalt
ad1f6a7b0d Merge "Add settings for SUW data control." into nyc-dev
am: 6e1e880

* commit '6e1e880f001ab3663fba3a7b6d292387efaf7b8f':
  Add settings for SUW data control.

Change-Id: I9a919ae9d8a960fa1540f051221643a5af3307c4
2016-04-11 21:35:48 +00:00
Greg Kaiser
c0b5c1c897 Merge "NanoApp: Make indentation consistent" into nyc-dev
am: 7c0393a

* commit '7c0393abdf121aca271f870d492def5b329b6360':
  NanoApp: Make indentation consistent

Change-Id: Ib1cdcfc2fe61266d4fcac44739f9273737108f56
2016-04-11 21:35:46 +00:00
Robert Greenwalt
6e1e880f00 Merge "Add settings for SUW data control." into nyc-dev 2016-04-11 21:28:01 +00:00
Adam Powell
eba13dd07f Prevent duplicate loader onLoadFinished calls on config change
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.

In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.

Bug 28074512

Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
2016-04-11 14:26:58 -07:00
Greg Kaiser
7c0393abdf Merge "NanoApp: Make indentation consistent" into nyc-dev 2016-04-11 21:21:37 +00:00
John Reck
f641379e1e Merge "Revert "Make stopped state a first-class thing"" into nyc-dev am: 825fa4d
am: 26d6685

* commit '26d6685d1eb59da2799d6c4d45b9ff67a537e99b':
  Revert "Make stopped state a first-class thing"

Change-Id: Ibcbd0b9a3246f67e41c293f5f1e79cffca3a9ec8
2016-04-11 21:15:18 +00:00
John Reck
26d6685d1e Merge "Revert "Make stopped state a first-class thing"" into nyc-dev
am: 825fa4d

* commit '825fa4d5ae7b2907ee1769d09e6333306de2a92e':
  Revert "Make stopped state a first-class thing"

Change-Id: I2f2a6281d0e0ba9587b00cdb6f1cb32ac632ee41
2016-04-11 21:05:20 +00:00
John Reck
825fa4d5ae Merge "Revert "Make stopped state a first-class thing"" into nyc-dev 2016-04-11 20:54:36 +00:00
John Reck
eab3f2658a Revert "Make stopped state a first-class thing"
This reverts commit 945961f78a.

Change-Id: Iebc1d49fac33380233f8785fc39bec6c30a5e714
2016-04-11 20:49:28 +00:00
Greg Kaiser
1f3560e75e NanoApp: Make indentation consistent
Four spaces is our style standard.

Change-Id: I94f4493268e29b7de5d4fc0f5ef98637997b3957
2016-04-11 12:49:21 -07:00
Greg Kaiser
4f633c7d32 Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev am: f4d3805
am: 1fd8534

* commit '1fd853468f4071cbdeb913954c9786d6cb6347ef':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Id42d34e96b39771a41acad0690553aecf896dd08
2016-04-11 17:35:52 +00:00
Greg Kaiser
1fd853468f Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev
am: f4d3805

* commit 'f4d380537a2d52c147d5c69d8ec124529fa4f7e6':
  ContextHubManager: Avoid bad NanoApp objects

Change-Id: Ie66a50ba0bdf10fcf4dfb91acfd5d1cd276dda88
2016-04-11 17:30:49 +00:00
Greg Kaiser
f4d380537a Merge "ContextHubManager: Avoid bad NanoApp objects" into nyc-dev 2016-04-11 17:23:48 +00:00
Makoto Onuki
b29ec1a7e4 Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev am: 390a813
am: 9a98e46

* commit '9a98e4679a64e8293a8b74677bb6b2839dae6a31':
  Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.

Change-Id: Ifb1f6d3331af119893007b46909e0e5ffcb210fc
2016-04-11 17:01:07 +00:00
Makoto Onuki
9a98e4679a Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev
am: 390a813

* commit '390a81302f13a0285e58e550cf786255ce5f8bd8':
  Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.

Change-Id: Ice1ba7818ca5da2da91d0cf1a3bc2baace82c7e8
2016-04-11 16:56:14 +00:00
Fyodor Kupolov
d0dba8b973 Merge "Added getProfileIds method returning array of userIds" into nyc-dev am: 4c74334
am: 036bdca

* commit '036bdcac4499b3ce6932f1ed237797332609c329':
  Added getProfileIds method returning array of userIds

Change-Id: If88d4c3d480be43fedae6a976467706bfbaf37b7
2016-04-11 16:50:59 +00:00
Chris Thornton
165046e0f0 Merge "Support multiple Enrollment APKs" into nyc-dev am: 9e928c1
am: 289eedb

* commit '289eedb6e836df0a8ae1bd64fd7068f6e9b5f8b0':
  Support multiple Enrollment APKs

Change-Id: Ica7e6ed3c9c49ba6fc92d9b16210d777d5c73fb7
2016-04-11 16:50:57 +00:00
Fyodor Kupolov
036bdcac44 Merge "Added getProfileIds method returning array of userIds" into nyc-dev
am: 4c74334

* commit '4c74334c4425e43dfb53bc2ef707eebb1bef7d5b':
  Added getProfileIds method returning array of userIds

Change-Id: Iea98c0fa6062e759da3adfe35c324a018aef2223
2016-04-11 16:46:01 +00:00
Chris Thornton
289eedb6e8 Merge "Support multiple Enrollment APKs" into nyc-dev
am: 9e928c1

* commit '9e928c1f715c53cc9cd6a85b3dcdcdc68cabc9c6':
  Support multiple Enrollment APKs

Change-Id: I66fbc18f3291a4178fdfb613c6a4e905edf5715e
2016-04-11 16:45:59 +00:00
Makoto Onuki
390a81302f Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev 2016-04-11 16:45:10 +00:00
Fyodor Kupolov
4c74334c44 Merge "Added getProfileIds method returning array of userIds" into nyc-dev 2016-04-11 16:40:55 +00:00
Chris Thornton
9e928c1f71 Merge "Support multiple Enrollment APKs" into nyc-dev 2016-04-11 16:40:43 +00:00
Yohei Yukawa
8394d0c31a Merge "Make additional IME Subtype ID persistent." into nyc-dev am: 063fe65
am: 72c98d6

* commit '72c98d6a08796b457ee0e83c7232276b77af6677':
  Make additional IME Subtype ID persistent.

Change-Id: I1e2afb7e2586f26b4e001bd991b996776eafcd00
2016-04-11 16:01:36 +00:00
Yohei Yukawa
72c98d6a08 Merge "Make additional IME Subtype ID persistent." into nyc-dev
am: 063fe65

* commit '063fe652be5ac01f1d4ffe621dc2a5f7e2170198':
  Make additional IME Subtype ID persistent.

Change-Id: I468fdb96d5a4963ae905059e38178e775da7755d
2016-04-11 15:54:31 +00:00
Yohei Yukawa
063fe652be Merge "Make additional IME Subtype ID persistent." into nyc-dev 2016-04-11 15:46:12 +00:00
Greg Kaiser
cb83bd04b7 ContextHubManager: Avoid bad NanoApp objects
We provide a preferred constructor for the user which will
always generate a serializable NanoApp object.  While we
still support the other path, we throw a specific exception
when trying to serialize a bad NanoApp object to ease
debugging.

Change-Id: I7ee610f0fce2f0dd489526e4819f66035281024b
2016-04-11 08:27:10 -07:00
Benjamin Franz
a53601c090 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev am: 3f7fdaa
am: 9a9a9aa

* commit '9a9a9aa9b3b1e3e5d4f9214b2c2055a24b73fc65':
  Revert "Throw security exception for non-parent aware APIs"

Change-Id: I5a98eed59c136d3d5d26a239d1e90657737e9449
2016-04-11 14:46:57 +00:00
Benjamin Franz
9a9a9aa9b3 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev
am: 3f7fdaa

* commit '3f7fdaaa766104cc5b8946676c9187661cb60aa7':
  Revert "Throw security exception for non-parent aware APIs"

Change-Id: I2c4754cb70096372f2b04f1f52ecc2c93a5f8ae2
2016-04-11 14:41:38 +00:00
Benjamin Franz
3f7fdaaa76 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 2016-04-11 14:32:49 +00:00
Benjamin Franz
a26c626564 Revert "Throw security exception for non-parent aware APIs"
This reverts commit bd7ae782ed.

Bug: 28107853

Change-Id: Ic286d9a181e96b8eb9826dab9ed297e0e4dfa6de
2016-04-11 12:43:17 +00:00
Yohei Yukawa
01d99958e6 Merge "Fix inefficient CursorAnchorInfo#hashCode()." into nyc-dev am: a8c81c1
am: eca483c

* commit 'eca483c3168240710edc7c6c9bca9551adcf7f49':
  Fix inefficient CursorAnchorInfo#hashCode().

Change-Id: Ib462661e2faced73956765f66f3c8fc6a2c43db7
2016-04-11 09:56:52 +00:00
Clara Bayarri
c4e4274d9e Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev am: 738ab04
am: 3f19243

* commit '3f192435a964c2c24073d1befe0c07e7eb37ff47':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: Idaf11769a1fc78cb759ab1303a82ba1d354a3076
2016-04-11 09:52:19 +00:00
Yohei Yukawa
eca483c316 Merge "Fix inefficient CursorAnchorInfo#hashCode()." into nyc-dev
am: a8c81c1

* commit 'a8c81c1a804cad61735753ff87ebb7bbf1a57383':
  Fix inefficient CursorAnchorInfo#hashCode().

Change-Id: I7d9f82b77ad2eed036446bd072ba91ebf1972377
2016-04-11 09:52:18 +00:00
Yohei Yukawa
a8c81c1a80 Merge "Fix inefficient CursorAnchorInfo#hashCode()." into nyc-dev 2016-04-11 09:49:23 +00:00
Clara Bayarri
3f192435a9 Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev
am: 738ab04

* commit '738ab04fd94746d47ebeffa97252b7e3fb2a8d93':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: I94122c113dd2eb8b02f21563f50d898f89db5515
2016-04-11 09:47:39 +00:00
Clara Bayarri
738ab04fd9 Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev 2016-04-11 09:43:16 +00:00
Yohei Yukawa
66baf69042 Make additional IME Subtype ID persistent.
It turns out that IME subtypes specified to
InputMethodManager#setAdditionalInputMethodSubtypes() are stored in the
presistent storate without subtype IDs.  As a result, when the system is
rebooted, the system would no longer consider those additional subtypes
as enabled due to subtype ID mismatch, until the IME re-adds those
additional subtypes again with the original subtype IDs.

Bug: 28104337
Change-Id: I1445213e0b83d76631a839b974ec1ab9b28ad7d2
2016-04-11 02:29:35 -07:00
Yohei Yukawa
b7edebc8ad Fix inefficient CursorAnchorInfo#hashCode().
It turns out that the current CursorAnchorInfo#equals() is quite
inefficient because our CursorAnchorInfo#hashCode() tries to use almost
all the fields.  Even worse, as Matrix#hashCode() is hard-coded to 44,
we get the same hashCode() when comparing two CursorAnchorInfo objects
that are different only in transformation Matrix after such a complex
hash calculation.

In the real world scenarios, most likely calculation hash code only from
Matrix and composing text would be good enough for our use case, because
the former can cover UI scrolling scenario and the latter can cover the
text typing scenario.  More complex hash calculation is probably
inefficient.

With this CL, CursorAnchorInfo#hashCode() is pre-calculated only from
those two fields, and carefully reorder comparisons in
CursorAnchorInfo#equals() to improve the likelihood of returning false
with fewer comparisons.

Bug: 28105733
Change-Id: Id896adeab5ffe87ceddb2c2762d6d91475e28ec4
2016-04-11 01:38:23 -07:00
Jeff Sharkey
4f61b2a50a Merge "Use inode numbers for CE storage." into nyc-dev am: 2e3ce4c
am: 5573294

* commit '5573294808e7c20b774e6b40e35fac5300707baf':
  Use inode numbers for CE storage.

Change-Id: I9c7084cea8a8a8436bced1f753260babba2f54e2
2016-04-11 06:43:12 +00:00
Jeff Sharkey
5573294808 Merge "Use inode numbers for CE storage." into nyc-dev
am: 2e3ce4c

* commit '2e3ce4ca462c8d5f0ebea9ba39246d949fff85fd':
  Use inode numbers for CE storage.

Change-Id: I30229864f33d9d3835aa6bdf8840e7fbaedc39ee
2016-04-11 06:18:12 +00:00
Jeff Sharkey
2e3ce4ca46 Merge "Use inode numbers for CE storage." into nyc-dev 2016-04-11 06:12:37 +00:00
Jeff Sharkey
4288419787 Use inode numbers for CE storage.
Certain operations, such as clearing/destroying app data, or just
counting on-disk size, require us to know the CE storage directory
of a particular app.  To facilitate these operations, offer a method
to get the inode of a CE directory, and accept that inode number
for later operations.  Collect and store the inode number in
PackageUserState for future use when that user's CE storage is
still locked.  This design means it's safe to clear/destroy app
data in both CE/DE storage at the same time.

Move most installd-related methods to a uniform calling convention
that accepts a single parent PackageParser.Package, and internally
fans out to handle all "leaf" packages under that parent.

In previous releases, we started installing apps using a new
directory-based layout, where all app code, unpacked native libraries,
and optimized code is bundled together.  So now we only have a single
path to measure for code size.  This fixes several outstanding bugs
that were causing sizes to be miscounted for apps supporting multiple
architectures.

Fix a subtle bug in PackageSettings that would cause "notLaunched"
to be parsed incorrectly.

Bug: 27828915, 27197819
Change-Id: Ia582cf3550553292bde4bb4313367111332913ec
2016-04-10 23:26:09 -06:00
Yohei Yukawa
a110c56a28 Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev am: 6feeedc
am: 92afb12

* commit '92afb12a7b9a263f9500b87ff48c0a3c8dff5740':
  Revert "Customizes input extract edit view for Wear"

Change-Id: I44bd900c1bd896f71cfcdadfd599a822520a1032
2016-04-10 00:51:08 +00:00
Yohei Yukawa
92afb12a7b Merge "Revert "Customizes input extract edit view for Wear"" into nyc-dev
am: 6feeedc

* commit '6feeedc72b582f042986218185877ddda49c867b':
  Revert "Customizes input extract edit view for Wear"

Change-Id: Ic1927a81dd1da61e62eb106a92064cc4c6955277
2016-04-10 00:47:42 +00:00
Yohei Yukawa
757224008e Revert "Customizes input extract edit view for Wear"
This reverts commit 880602eb64 [1],
which was committed with a wrong author email address and lacked license
notice in some files.  To avoid confusion, this we decided to
temporarily revert that CL so that we can commit it with proper license
notice and author address again.

 [1]: I16226ce393f2d15065d08e66a36d008eb1a0c8a1

Bug: 22512982
Bug: 28098677
Change-Id: I3dd3c7bf0ee9634fc4f3bf433bf5023675873e46
2016-04-09 15:24:02 -07:00