Commit Graph

59541 Commits

Author SHA1 Message Date
Oren Blasberg
f6a02c4cda Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0 am: 1fab8d9
am: 306ceb8

* commit '306ceb84b4c8833eaa46093fbba7638378eee456':
  Accommodate NaN in new context menu methods.

Change-Id: Iddd48717534ab7ce5ef93aab0016190a50c42e9b
2016-04-27 01:23:54 +00:00
Ruben Brunk
dd1a9e05ef Merge "Add manifest attribute for VR activities." into nyc-dev am: f84b3e0 am: 45d6192
am: 842d0d4

* commit '842d0d44883591ba7221ff62c55a1efd70876ca0':
  Add manifest attribute for VR activities.

Change-Id: Ie2f10baef334561e66e08eceb8a73e860e308514
2016-04-27 01:21:14 +00:00
sergeyv
aa5122b675 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev am: c015719 am: 47591b0
am: 9f12dd4

* commit '9f12dd434854d0bfc70dd95b9ef630a60adfebf9':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: Ie022389901d40c4e814706c9eab8d8249b85e54c
2016-04-26 23:33:02 +00:00
Oren Blasberg
306ceb84b4 Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
am: 1fab8d9

* commit '1fab8d995e74de2128b45d9cae294c8d5ccf2fc6':
  Accommodate NaN in new context menu methods.

Change-Id: Ifaf625d13b5dc57cf69f10ef1af99aef4acfecb6
2016-04-26 23:16:14 +00:00
Ruben Brunk
842d0d4488 Merge "Add manifest attribute for VR activities." into nyc-dev am: f84b3e0
am: 45d6192

* commit '45d61923dfca1fd860640566d96d7107c9c6b1dc':
  Add manifest attribute for VR activities.

Change-Id: I1f19608ba31f930201c701df929212759a2960c1
2016-04-26 23:15:57 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Ruben Brunk
f84b3e0e2f Merge "Add manifest attribute for VR activities." into nyc-dev 2016-04-26 22:05:30 +00:00
sergeyv
47591b04dc Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev
am: c015719

* commit 'c015719954d9a1c0a53f277f68405401207a0c65':
  DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB

Change-Id: I3f5e7bd67b57d074939e1db6ef0651ade46d31bf
2016-04-26 21:44:54 +00:00
Sergei Vasilinetc
c015719954 Merge "DisplayListCanvas: throw exception at attempt to draw bitmap with size > 100MB" into nyc-dev 2016-04-26 21:39:43 +00:00
Svet Ganov
db2174dcb8 Merge "Ensure local settings caches are not stale" into nyc-dev am: f71d7fe am: d4bc15b
am: 0010741

* commit '0010741818127e6c9449fc49490f0bad14a76240':
  Ensure local settings caches are not stale

Change-Id: I26c4f1f72eda3b2ebfb3ca6e086a0381d357471c
2016-04-26 18:54:37 +00:00
Svet Ganov
d4bc15b66b Merge "Ensure local settings caches are not stale" into nyc-dev
am: f71d7fe

* commit 'f71d7feef22db9e0cab2f32edc7440aedb86fdfe':
  Ensure local settings caches are not stale

Change-Id: I356b9ad0b6dc1e91bfad140de1b9fc79ab6efef3
2016-04-26 18:47:52 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
Svet Ganov
53a441ca8e Ensure local settings caches are not stale
We used the system proterties as a shared memory mechanism
to propagate information to local settings caches when the
content has changed and the cache should be cleared. The
system properties are unfortunately updated asynchronously
leading to cases where clients may read stale data.

This change adds a simple int array data structure backed
by shared memory which guarantees individual values are
atomically read and updated without memory tear. Multi-
index opearations are not synchronized between each other.

The settings provider is using the new data structure to
propagate the settings generation which drives when caches
are purged.

We have a single memory array keeping the generation for
different settings tables per user. Since memory array is
not a compact data structure and the user space exceeds
the memory array size we use an in-memory map from keys
to indices in the memory array where the generation id of
a key is stored. A key is derived by the setting type in
the 4 most significant bits and the user id in the 28 least
significant bits.

The mapping from a key to an index is cleared if the user is
removed and the corresponding index in the memory arry is
reset to make it available for other users. The size of the
memory array is derived from the max user count that can be
created at the same time.

bug:18826179

Change-Id: I64009cc5105309ef9aa83aba90b82afc8ad8c659
2016-04-26 11:31:55 -07:00
Alan Viverette
4b8994aa30 Merge "Apply tint when setting check mark drawable" into nyc-dev am: fff349d am: bed34a7
am: 50b5ba6

* commit '50b5ba61b5730fe82f9ad9da61953b4daa2f21aa':
  Apply tint when setting check mark drawable

Change-Id: I1207ab3c4388be1150712df614238fac49160019
2016-04-26 17:33:12 +00:00
Alan Viverette
bed34a705d Merge "Apply tint when setting check mark drawable" into nyc-dev
am: fff349d

* commit 'fff349ddbaf6d31f7373f854e85f2171adf2ef97':
  Apply tint when setting check mark drawable

Change-Id: I8b7c195ee10fddfa022f95a021fe0c0f60f1e0ec
2016-04-26 17:23:59 +00:00
TreeHugger Robot
fff349ddba Merge "Apply tint when setting check mark drawable" into nyc-dev 2016-04-26 17:17:05 +00:00
Julia Reynolds
d33451c837 Merge changes from topic \'api_review\' into nyc-dev am: a0676c9 am: a6c9a89
am: d9c4c76

* commit 'd9c4c7650f4ee6ea3282cc097d1d0f0756d32c69':
  Api review: Settings.
  Reduce spacing.

Change-Id: I781cda64e8ecfd64ba236f8b8401f2f20a7df5d1
2016-04-26 16:16:09 +00:00
Andreas Gampe
37f11ecd43 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 396c590 am: 12aea50
am: d8998a4

* commit 'd8998a48c9ff362aaf081b1fd74877903c2dab11':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Iae09599af115044fd6e1c37c0f0222fe766281f0
2016-04-26 16:15:18 +00:00
David Brazdil
badba5893f Merge "Change app selection policy for post-OTA verification" into nyc-dev am: 3eaf72d am: 9ada71d
am: b424dd9

* commit 'b424dd9e1ea1c1be3577db90b8420b94eb5632c6':
  Change app selection policy for post-OTA verification

Change-Id: Ic81447d56181f0246af6127cd2b6331b1084a09e
2016-04-26 16:14:50 +00:00
Narayan Kamath
c6a63f34cd LoadedApk: Don\'t set up JIT profile support inside the system_server. am: 2d4a222 am: 3ec2508
am: 1f803c3

* commit '1f803c3c75cf089f704e1cbf2d81b56597f6c263':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I9a8587ea42d116bdf60845e9f41b88c275c9b751
2016-04-26 16:14:17 +00:00
Hui Shu
0b9717f813 Merge "WebView downgrade prevention logic" into nyc-dev am: e12d62b am: b5829cd
am: bb639b6

* commit 'bb639b671ccf7d9d401665cc3bd31dac926e0228':
  WebView downgrade prevention logic

Change-Id: I28066d48ce1b68a9a370af1ca88e027c1e91df9d
2016-04-26 16:12:17 +00:00
Jaewan Kim
9ea37b9bee Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 0f360d8
am: 8416446

* commit '8416446ef78d6e51069027f7e8f8148b340b4332':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I3ac695a7729ceb8e8c06e6df150fe3be1c351d7f
2016-04-26 16:07:31 +00:00
Julia Reynolds
d9c4c7650f Merge changes from topic \'api_review\' into nyc-dev am: a0676c9
am: a6c9a89

* commit 'a6c9a892365864f715da31210304cdc3ada6a15b':
  Api review: Settings.
  Reduce spacing.

Change-Id: I4922a4e4beb8544c10e246b764097048328ec20e
2016-04-26 15:43:30 +00:00
Julia Reynolds
d72d5823b8 Merge changes from topic \'api_review\' into nyc-dev
am: a0676c9

* commit 'a0676c92078b3d5abd850052db80e3b619ce1c5f':
  Api review: Settings.
  Reduce spacing.

Change-Id: I53898c0378b124a6b44872493e481d10dfd6518f
2016-04-26 15:38:00 +00:00
TreeHugger Robot
d8998a48c9 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev am: 396c590
am: 12aea50

* commit '12aea502c103777317d6105f59365384034ced8a':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: Ifc6094201f1c92b92465010ab6f965d7946ec0e7
2016-04-26 15:34:26 +00:00
Andreas Gampe
9b923b9f63 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev
am: 396c590

* commit '396c590c423682af398f52a62e3d6f6fb2166d4e':
  Frameworks/base: Make debug helper lazy in ConnectivityManager

Change-Id: I38789a6165023d77c0a730591cd7fa1c45588dc5
2016-04-26 15:31:11 +00:00
Julia Reynolds
a0676c9207 Merge changes from topic 'api_review' into nyc-dev
* changes:
  Api review: Settings.
  Reduce spacing.
2016-04-26 15:29:11 +00:00
TreeHugger Robot
396c590c42 Merge "Frameworks/base: Make debug helper lazy in ConnectivityManager" into nyc-dev 2016-04-26 15:25:44 +00:00
David Brazdil
9ada71dccf Merge "Change app selection policy for post-OTA verification" into nyc-dev
am: 3eaf72d

* commit '3eaf72dc67ef0911bee0cc0d1db088cb70b044ca':
  Change app selection policy for post-OTA verification

Change-Id: I00ece6027cd8ae3cb513e361853136d7d314adf8
2016-04-26 12:27:30 +00:00
David Brazdil
3eaf72dc67 Merge "Change app selection policy for post-OTA verification" into nyc-dev 2016-04-26 12:22:16 +00:00
Narayan Kamath
3ec2508c99 LoadedApk: Don\'t set up JIT profile support inside the system_server.
am: 2d4a222

* commit '2d4a222de157c693b16ca2b35a264dd92ae6abee':
  LoadedApk: Don't set up JIT profile support inside the system_server.

Change-Id: I52d0cb275f3d01a094aefed65e43a2882d00679c
2016-04-26 12:18:52 +00:00
Narayan Kamath
2d4a222de1 LoadedApk: Don't set up JIT profile support inside the system_server.
We shouldn't profile *any* packages loaded by the system_server, not
just the system_servers own ("android") package.

bug: 28241500
Change-Id: I5f3f477b40c758030a5bdc8e97d17cab6e68e204
2016-04-26 12:08:23 +00:00
David Brazdil
90e269917e Change app selection policy for post-OTA verification
Changes the policy for selecting packages which will be pre-verified
during post-OTA boot animation.

For Nx to Ny, an app is pre-verified if used in the foreground in the
last 7 days, or if its APK was loaded by other apps.

For M to N (or early N builds without detailed stats), an app is
pre-verified if it has any recorded use in the last 7 days.

Bug: 27902702
Bug: 27350503
Change-Id: I2b38daf017ecd0e5aa5ed596ed9351cffa03dbcb
2016-04-26 12:51:53 +01:00
Hui Shu
b5829cdf11 Merge "WebView downgrade prevention logic" into nyc-dev
am: e12d62b

* commit 'e12d62bd79d27f1719ac6db01b1dd53289fe03d4':
  WebView downgrade prevention logic

Change-Id: I9d67d612696078b647eef9ac575da0e47e08eab4
2016-04-26 09:35:36 +00:00
TreeHugger Robot
e12d62bd79 Merge "WebView downgrade prevention logic" into nyc-dev 2016-04-26 09:31:57 +00:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
bdc4700155 Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist" into nyc-dev 2016-04-26 06:03:01 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Lorenzo Colitti
35ffc550dd Merge "Merge "When dumping connectivity metrics events, print data as well." into nyc-dev am: e4860f0 am: 8711593" into nyc-mr1-dev-plus-aosp
am: 05b4399

* commit '05b4399242ae4759143c7ca3bd72565c1bbee74e':
  When dumping connectivity metrics events, print data as well.

Change-Id: I094e96703fba00a24ce90670b3966ebc9f5e392d
2016-04-26 03:58:41 +00:00
Lorenzo Colitti
87115932c5 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev
am: e4860f0

* commit 'e4860f02564e887918192f733a29f04552f83414':
  When dumping connectivity metrics events, print data as well.

Change-Id: I63c0b56f9f54e0df794b3061e310c702f638b857
2016-04-26 03:28:34 +00:00
Lorenzo Colitti
e4860f0256 Merge "When dumping connectivity metrics events, print data as well." into nyc-dev 2016-04-26 03:22:26 +00:00
Jeff Sharkey
bee17df836 Merge "Track down Contexts without data directories." into nyc-dev am: 3a10c1e am: 3bf4cd1
am: 47e625c

* commit '47e625c64c811d8a373784e0172b2eb8ed60c70a':
  Track down Contexts without data directories.

Change-Id: I2897b5a85ca276b28fe2eb4c02ea679cb2344317
2016-04-25 23:34:35 +00:00
Alex Light
2f46f70798 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev am: 57413a7 am: 7ad3001
am: 6534e16

* commit '6534e16cf73005baaf9ed7c537b030ca1c67aa9f':
  Make fake libart for misbehaving apps be loaded.

Change-Id: If20e1dad4170e0b9cf007a5bcd7420762deb0664
2016-04-25 23:04:11 +00:00
Jeff Sharkey
3bf4cd1fb5 Merge "Track down Contexts without data directories." into nyc-dev
am: 3a10c1e

* commit '3a10c1e86db9843462660d825a9673a3c72ccdd6':
  Track down Contexts without data directories.

Change-Id: Id6934369489b8a60e8d6ceb3de8f7774c5128ed6
2016-04-25 22:57:37 +00:00
Jeff Sharkey
596e8588b1 resolve merge conflicts of d1153a3 to master
Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267
2016-04-25 16:40:38 -06:00
Alex Light
7ad3001399 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev
am: 57413a7

* commit '57413a74777060d9368f89966e9abcf96e33af8e':
  Make fake libart for misbehaving apps be loaded.

Change-Id: Iba15cda4cda9968dbe303919427ad192bb940f46
2016-04-25 22:04:53 +00:00
Jeff Sharkey
3a10c1e86d Merge "Track down Contexts without data directories." into nyc-dev 2016-04-25 21:59:41 +00:00
Jeff Sharkey
5df7298c59 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp
Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22
2016-04-25 15:53:50 -06:00
TreeHugger Robot
57413a7477 Merge "Make fake libart for misbehaving apps be loaded." into nyc-dev 2016-04-25 21:53:31 +00:00
Jeff Sharkey
79014856cc resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp
Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377
2016-04-25 15:52:11 -06:00