Commit Graph

58636 Commits

Author SHA1 Message Date
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
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
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
Jorim Jaggi
ab037375c3 Merge "Only force drawing status bar background if target >= N" into nyc-dev am: fe52f91
am: fe6cec1

* commit 'fe6cec1ac00a4b60689a774bfef720c3b6f06b61':
  Only force drawing status bar background if target >= N

Change-Id: Iaacf9fb25df6ce08ab0b6fbcf7fcc23b5abfea26
2016-04-09 06:25:57 +00:00
Jack Yu
2890f6053f Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev am: 2e062ab
am: 6754d23

* commit '6754d237bb8c6e1fba779f90417b4a2fe07d2b3e':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I0f37f4d296de88763019f469a0356e753b9f3636
2016-04-09 06:25:54 +00:00
Amith Yamasani
8528648384 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev am: 0cc0381
am: 597965f

* commit '597965f5384b5f4f77ae4ef39e8db799529ab46d':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: Ida3e6c5ce407007955eb1533f13d6465e194937c
2016-04-09 05:58:21 +00:00
Zhijun He
8fcc25dade Merge "Camera2: update API per API council review" into nyc-dev am: b0fe2a9
am: c2ec322

* commit 'c2ec3226ea018e415c57871727c34d44abd80ca4':
  Camera2: update API per API council review

Change-Id: I4ad3be32bee216a92731b07901a661c1ce0463b3
2016-04-09 05:57:41 +00:00
Phil Weaver
44881fb8b2 Merge "Reduce unnecessary accessibility cache clearing." into nyc-dev am: af93306
am: 618fda2

* commit '618fda27082bd184ee031f9a2b9945b7f4aa1cfc':
  Reduce unnecessary accessibility cache clearing.

Change-Id: Ic5ed49358f6dadcbce6fc9bb16b63ec55e8a9b60
2016-04-09 05:57:17 +00:00
Tenghui Zhu
01752ed85b Merge "Update the documentation on createCircularReveal" into nyc-dev am: 3cb5ba7
am: 49de023

* commit '49de023f1bdefc4a1bb604c9ce1665abc9cf0719':
  Update the documentation on createCircularReveal

Change-Id: I3209064f0c2b1614c27e00cf3c454de74385eab6
2016-04-09 05:56:50 +00:00
Bryce Lee
744743a869 Merge "Add granular control over disabled effects." into nyc-dev am: 196a057
am: 931690f

* commit '931690f28a074b3882cdd1c6b7d54a23d74437a6':
  Add granular control over disabled effects.

Change-Id: Ibaf6cfb3f7b6a63b6de2b89a7116b36dfdbe178d
2016-04-09 05:56:02 +00:00
Mark Renouf
e8117a1a1f Merge "Customizes input extract edit view for Wear" into nyc-dev am: 4430308
am: 41178c2

* commit '41178c21c8ef9fabae09d39ba32bd0dcb5e97b43':
  Customizes input extract edit view for Wear

Change-Id: I0d485235c2599c80d313507e03eda4f38a6717c6
2016-04-09 05:55:32 +00:00
Julia Reynolds
c54a7d7b76 Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9
am: af343d6

* commit 'af343d6796eb0996d134bd606b76b6b2ee5bb185':
  Allow the ranker to autobundle notifications.

Change-Id: I9b5011fa6261d8717db66c5786b51679188f6d8c
2016-04-09 05:53:09 +00:00
Jason Monk
847c7e8c2a Merge "Allow mode of TileService to be changed" into nyc-dev am: aa336f8
am: 1476f35

* commit '1476f3573be229ae00c3a13afb324648305a8bf8':
  Allow mode of TileService to be changed

Change-Id: I8a6b58f4dd2d8bd135e4cadfdc63198720d6e7a8
2016-04-09 05:52:16 +00:00
Dianne Hackborn
15a3cde2a1 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev am: 6827db3
am: 97907066

* commit '97907066c6cf19eb85607798a41a6f002fb4ea1a':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I44ac8048311da7e3ea274b532c25e150e2b044ce
2016-04-09 05:50:53 +00:00
Adam Powell
c72c505b23 Merge "Chooser filtering and caller direct share targets" into nyc-dev am: fe5e1a7
am: a1be176

* commit 'a1be176a42db8dad7dcebca8842b95bbf6cc6bf9':
  Chooser filtering and caller direct share targets

Change-Id: I17d733ef5f6d2381dea3050f666436fbfe185982
2016-04-09 05:50:11 +00:00
Andrii Kulian
04154a27ae Merge "Fix multiple configuration changes in multiwindow" into nyc-dev am: 21400cb
am: d4b770e

* commit 'd4b770e16e875a8c6339c40d90dc27e2791e9631':
  Fix multiple configuration changes in multiwindow

Change-Id: I7c8b421a3437fca2a7dd82ab5cf46b8a0bc06831
2016-04-09 05:49:24 +00:00
Phil Weaver
c0abe7795f Merge "Eliminate side effects of a11y window title." into nyc-dev am: ab4d5ff
am: 9a37547

* commit '9a375470d4e3f3fde29ea5925454f49c6dc84274':
  Eliminate side effects of a11y window title.

Change-Id: I3af7aa51c888a0405a171d81869b9749a6056e33
2016-04-09 05:48:21 +00:00
Jorim Jaggi
fe6cec1ac0 Merge "Only force drawing status bar background if target >= N" into nyc-dev
am: fe52f91

* commit 'fe52f91f0cee39b186b1b892fc3344d3279640cf':
  Only force drawing status bar background if target >= N

Change-Id: I424d896d801dc57ed8e14fce3205644060d33e8e
2016-04-09 04:11:00 +00:00
Jorim Jaggi
fe52f91f0c Merge "Only force drawing status bar background if target >= N" into nyc-dev 2016-04-09 04:04:35 +00:00
Jorim Jaggi
8f5701bd9f Only force drawing status bar background if target >= N
Since forcing it all the time has the potential of breaking
compatibility with apps, we don't want to do this.

Instead, we only force it if the app targets >= N.

We communicate this to window manager with
PRIVATE_FLAG_FORCE_DRAW_STATUS_BAR_BACKGROUND.

We introduced this for 2-up split-screen. If we have an app
that doesn't draw the status bar background by itself, we
just force the whole bar to be black.

The same applies for windows that used translucent status
bar - we also force the whole bar to be black

Bug: 27285627
Change-Id: I7f1ceaa364f8a4e851935f77aa5e8d913bf11791
2016-04-08 20:49:20 -07:00
Jack Yu
6754d237bb Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev
am: 2e062ab

* commit '2e062ab8de3bae82b76a3f3aaeac6994f2555fe5':
  Excluded certain APNs (e.g. IMS) from mobile data usage.

Change-Id: I72b09515578a1843009439b1a8fbccccaaf3ab4c
2016-04-09 03:37:54 +00:00
Jack Yu
2e062ab8de Merge "Excluded certain APNs (e.g. IMS) from mobile data usage." into nyc-dev 2016-04-09 03:30:31 +00:00
Amith Yamasani
597965f538 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev
am: 0cc0381

* commit '0cc0381714f0356dd6cece201265b368fa2706b6':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: I81a9d06e3ce67859f32476f7a5c2c3b87e6f8d4f
2016-04-09 01:43:20 +00:00
Amith Yamasani
0cc0381714 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev 2016-04-09 00:47:23 +00:00
Zhijun He
c2ec3226ea Merge "Camera2: update API per API council review" into nyc-dev
am: b0fe2a9

* commit 'b0fe2a9637dc45ac319af9ab848b034ed4a414d3':
  Camera2: update API per API council review

Change-Id: I86daab40a4cdb957c95509fc33eb2b25e95cad84
2016-04-09 00:43:29 +00:00