240859 Commits

Author SHA1 Message Date
Android Build Merger (Role)
f49f8eeb72 Merge "Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f am: a732be1" into nyc-dev 2016-04-26 21:55:36 +00:00
Android Build Merger (Role)
ebb60eb1c0 Merge "Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am: 8ea3fd8 am: f1cb86cc am: 690cba0" into nyc-dev 2016-04-26 21:55:27 +00:00
Android Build Merger (Role)
57add8cae5 Merge "Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am: 42a3312 am: faa815d am: 2ca2a2c" into nyc-dev 2016-04-26 21:55:16 +00:00
Android Build Merger (Role)
63791f2131 Merge "docs: Added link to "preparing for multiwindow" blog post am: d93472b am: 5db4e1f am: 04b4190" into nyc-dev 2016-04-26 21:55:06 +00:00
Android Build Merger (Role)
376b149abd Merge "Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am: a23e28f am: fbb8b65 am: 3832614" into nyc-dev 2016-04-26 21:54:55 +00:00
Android Build Merger (Role)
be3f2dee5d Merge "Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am: abb9f4d am: fe0cc90 am: e8b402e" into nyc-dev 2016-04-26 21:54:45 +00:00
Android Build Merger (Role)
f11c479e69 Merge "Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am: f2988f5 am: 2291d03 am: 25570d5" into nyc-dev 2016-04-26 21:54:34 +00:00
Android Build Merger (Role)
d942882bbf Merge "Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am: f70f0f4 am: 9f57db1 am: cedb262" into nyc-dev 2016-04-26 21:54:25 +00:00
Android Build Merger (Role)
4da53c0e77 Merge "Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am: 71b1f0b -s ours am: a6d7166 am: 0446ed4 am: f786db7" into nyc-dev 2016-04-26 21:54:16 +00:00
Android Build Merger (Role)
07773c7e11 Merge "simplification and clarification to the Studio Overview am: e9b3ada am: f1a5076 am: 1f8be54" into nyc-dev 2016-04-26 21:54:05 +00:00
Android Build Merger (Role)
2b0a5c9667 Merge "Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am: 49b17d3 am: 30c61f9 am: 07bfe29" into nyc-dev 2016-04-26 21:53:55 +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
Sergei Vasilinetc
b7d1657016 Merge "Stop always set OffsetByFudgeFactor in renderVertexBuffer" into nyc-dev 2016-04-26 21:39:09 +00:00
Kevin Hufnagle
ab38a66142 Merge "docs: Fixed Marshmallow links in API level table." into mnc-mr-docs am: 88e19d1 am: 2d9cc0f
am: a732be1

* commit 'a732be179d7bc06580b66669d6b6c7ebe05b9e01':

Change-Id: I1a2d3eba374fe931b28e0358740d545348ebceba
2016-04-26 21:03:09 +00:00
Kevin Hufnagle
049902fae8 Merge "docs: Removed "Drive Installs from Search" page." into mnc-mr-docs am: 8ea3fd8 am: f1cb86cc
am: 690cba0

* commit '690cba02682e89299f94d58a5ea9f212006c11c4':

Change-Id: I958d262d9022e91a85f75af7f3e8cb9af1e1f355
2016-04-26 21:00:06 +00:00
Joe Fernandez
d8e20a310d Merge "docs: NDK r11c - release notes and downloads" into mnc-mr-docs am: 42a3312 am: faa815d
am: 2ca2a2c

* commit '2ca2a2c86571d0ad05b95ea0bda7d33414e4cb89':

Change-Id: Ica6e6425d795da330da197536a0e516fb53c8b7d
2016-04-26 20:57:54 +00:00
Andrew Solovay
22df4ed94c docs: Added link to "preparing for multiwindow" blog post am: d93472b am: 5db4e1f
am: 04b4190

* commit '04b41903f9c4ceebc0f5d2e03f8f921f5dc95e69':

Change-Id: I789b9b1066978a665b1262e46a8331c07cd7e9c3
2016-04-26 20:55:21 +00:00
Andrew Solovay
197cfcde13 Merge "docs: Clarified how multi-window applies to activities in task stack" into mnc-mr-docs am: a23e28f am: fbb8b65
am: 3832614

* commit '3832614650f39719dbbb52ee092c0826291d6516':

Change-Id: Ic5aab52976bceb23ad6c584b87ee86fcff634c76
2016-04-26 20:52:24 +00:00
Elliot Waite
369a536e54 Merge "Change colons to equals for custom_link_attributes." into mnc-mr-docs am: abb9f4d am: fe0cc90
am: e8b402e

* commit 'e8b402e20533d5ce7387a4666683c971b22ba381':

Change-Id: Ie43452782ce7ab1e1bdbce67c007b2d3705c7910
2016-04-26 20:49:26 +00:00
Miao Wang
77f655c2a2 Merge "[RenderScript] Update documentation about API level and RS Support Lib." into mnc-mr-docs am: f2988f5 am: 2291d03
am: 25570d5

* commit '25570d531904594d0e73cbc5c7a5105006aa8cdd':

Change-Id: I91af0cd7f8a87e3bf00261cece1bf19c9fb88790
2016-04-26 20:46:23 +00:00
sreevanis
65600189ae Merge "cherrypick from mnc-docs docs: Updated API changes for Dinar wearable support." into mnc-mr-docs am: f70f0f4 am: 9f57db1
am: cedb262

* commit 'cedb262cfaffed00f091d2a0abe22f92f9809d3e':

Change-Id: I216382c84e33766b5d6d3bdc6c831ffd9afa6560
2016-04-26 20:43:10 +00:00
sreevanis
88121700dd Merge "docs: Updated API changes for Dinar wearable support." into mnc-docs am: 71b1f0b -s ours am: a6d7166 am: 0446ed4
am: f786db7

* commit 'f786db7b9bcc6ebfa79b4bc60a837877e5a8a380':

Change-Id: I0c8528b9a6a0313f8983cd4d75adc244ec68f92d
2016-04-26 20:40:13 +00:00
smain@google.com
0459843629 simplification and clarification to the Studio Overview am: e9b3ada am: f1a5076
am: 1f8be54

* commit '1f8be548ae1c21be6651ddc2621018b2028c58d0':

Change-Id: I2e08479aadd3d223b11e10d873239e14ed1a6976
2016-04-26 20:36:57 +00:00
smain@google.com
e4a095ab6a Merge "improved structure and organization between video and training docs on the Training landing page." into mnc-mr-docs am: 49b17d3 am: 30c61f9
am: 07bfe29

* commit '07bfe296d0e7337ba42fcf260d1029746308a262':

Change-Id: Iedc8b307eba45aa106b52fac980fe1c0fe8cdae3
2016-04-26 20:34:41 +00:00
Chris Craik
987609f5a7 Merge "Improve SurfaceView postion snapping" into nyc-dev 2016-04-26 20:20:39 +00:00
Mady Mellor
6e3a90d9b7 Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev 2016-04-26 19:38:44 +00:00
Chris Banes
94121762ff Merge "Fix onPrepareActionMode() not being called" into nyc-dev 2016-04-26 19:20:16 +00:00
Svetoslav Ganov
f71d7feef2 Merge "Ensure local settings caches are not stale" into nyc-dev 2016-04-26 18:36:28 +00:00
TreeHugger Robot
83ca62bdbe Merge "Remove -night qualified resources" into nyc-dev 2016-04-26 18:33:05 +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
Eino-Ville Talvala
e9bfc4e20b Merge "SchedulingPolicyService: Fix UID for cameraserver" into nyc-dev 2016-04-26 18:21:43 +00:00
Mady Mellor
a6edc87829 Fix a crash when setting vertical gear location and content view null
When setting the vertical location of the gear we need the collapsed
height of the parent, the parent might not be fully laid out so move
setting the vertical location into onLayout instead

Bug: 28390732
Change-Id: I7c1bf14a54e9f1ef0a693fa13e1a6533f5967631
2016-04-26 11:01:03 -07:00
TreeHugger Robot
9444231550 Merge "Bluetooth: Fine tune audio gain for Absolute Volume case" into nyc-dev 2016-04-26 17:43:22 +00:00
TreeHugger Robot
34510eb293 Merge "Don't opt-out of warning dialog by default on user builds." into nyc-dev 2016-04-26 17:40:29 +00:00
Todd Kennedy
69582262f0 Merge "Add "do not kill" install option" into nyc-dev 2016-04-26 17:17:50 +00:00
TreeHugger Robot
fff349ddba Merge "Apply tint when setting check mark drawable" into nyc-dev 2016-04-26 17:17:05 +00:00
Liejun Tao
39fb5670a8 Bluetooth: Fine tune audio gain for Absolute Volume case
Fine tune the audio gain for Bluetooth Absolute Volume.
Use 50%, 70% and 85% for lowest volume steps 1, 2 and 3.
Thus the volume change sounds smoother, more linear.
When remote end tune volume out of mute, we should also
tune the audio gain for the lowest volume steps.

Bug: 26694114
Change-Id: I298a334a4b40ddb87495fda1935349bfce8b0537
2016-04-26 09:19:17 -07: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
Chris Wren
6392db9df7 Merge "cancel group children before summaries" into nyc-dev 2016-04-26 15:26:35 +00:00
Julia Reynolds
efb951d4fe Merge "Swap star tint." into nyc-dev 2016-04-26 15:26:28 +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
Julia Reynolds
d500495935 Swap star tint.
Bug: 27558254
Change-Id: Ia72cdc89d4cdcf3f5a5210f14632c15271922a98
2016-04-26 09:17:08 -04: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
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
Chris Banes
3cff56b678 Fix onPrepareActionMode() not being called
Happens because mActionMode was set at the end
of the call, which means that invalidate() doesn't
actually do anything.

BUG: 28392319
Change-Id: Ifdc97c03dc43bfbe74790f90764d1575bd9ca951
2016-04-26 12:53:59 +01: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
David Brazdil
5bc7f5f01b Merge "Enable profile merging for post-OTA package verification" into nyc-dev 2016-04-26 11:39:43 +00:00
David Brazdil
5da9dad2dd Enable profile merging for post-OTA package verification
Currently post-OTA verification will attempt to compile with
'verify-profile' but does not merge the profiles prior to calling
dex2oat. As a result, we may miss some or all classes that need
verification.

Bug: 27688727
Change-Id: I1aa93cad2686513594cb37f6d3d181ae5c718d1d
2016-04-26 11:37:49 +00:00
TreeHugger Robot
e12d62bd79 Merge "WebView downgrade prevention logic" into nyc-dev 2016-04-26 09:31:57 +00:00
Shreyas Basarge
a16a3362b5 Merge "Wait for JobService to start before scheduling syncs" into nyc-dev 2016-04-26 09:23:30 +00:00