OSDN Git Service

android-x86/frameworks-base.git
7 years agoRecents TV: Do not allow negative delay
Sid Soundararajan [Wed, 5 Oct 2016 17:30:32 +0000 (10:30 -0700)]
Recents TV: Do not allow negative delay

In rare cases, the getChildCount() has a delayed update. It enters the
for loop, and then changes to return 0. This can potentially allow
a negative delay, causing a crash.

BUG: 31933255
Change-Id: Ia245edc9fca0e1712c2af5c301bac632caed1568

7 years agoMerge changes I99f18930,I5f6830d8 into nyc-mr1-dev
Rob Carr [Tue, 4 Oct 2016 20:58:42 +0000 (20:58 +0000)]
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev

* changes:
  Prevent any rotation while seamless rotation is pending.
  Prevent triggering orientation changes until previous completes.

7 years agoMerge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev
Jason Monk [Tue, 4 Oct 2016 20:33:13 +0000 (20:33 +0000)]
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev

7 years agoMerge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev
Lei Yu [Tue, 4 Oct 2016 19:51:22 +0000 (19:51 +0000)]
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev

7 years agoQS: Don't set flashlight state when we don't have an id
Jason Monk [Tue, 4 Oct 2016 18:50:11 +0000 (14:50 -0400)]
QS: Don't set flashlight state when we don't have an id

Also add a dump to FlashlightController for better visibility.

Change-Id: I7e826c58598ccc18e211aaab31a2e4d039234fc1
Fixes: 31352536

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:47:00 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 4 Oct 2016 18:46:40 +0000 (18:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Reload state when user unlocks" into nyc-mr1-dev
Jorim Jaggi [Tue, 4 Oct 2016 09:55:28 +0000 (09:55 +0000)]
Merge "Reload state when user unlocks" into nyc-mr1-dev

7 years agoMerge changes from topic 'avoidbadwifi' into nyc-dr1-dev
Lorenzo Colitti [Tue, 4 Oct 2016 07:50:20 +0000 (07:50 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev
am: 291af5c568

Change-Id: Idf4004f1cfb6b1b4c53d699f98faff5a55fc7b90

7 years agoIgnore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
Lorenzo Colitti [Tue, 4 Oct 2016 07:50:14 +0000 (07:50 +0000)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
am: f11ee9f592

Change-Id: I3090ac5fe7dabf2ee19120bd0ab566edaa95ddb6

7 years agoSlightly simplify IpManager#compareProvisioning.
Lorenzo Colitti [Tue, 4 Oct 2016 07:49:23 +0000 (07:49 +0000)]
Slightly simplify IpManager#compareProvisioning.
am: b77b775213

Change-Id: I31ab37d3fc39baf73fa14ef3b54b781b60347b41

7 years agoConditionally accept loss of on-link IPv6 DNS servers
Erik Kline [Tue, 4 Oct 2016 07:48:46 +0000 (07:48 +0000)]
Conditionally accept loss of on-link IPv6 DNS servers
am: 5b437d6ff9

Change-Id: Ie32080d7918dea0ae89bd3e0987cb1c8f121e0bd

7 years agoRefactor "avoid bad wifi" logic into a utility class
Erik Kline [Tue, 4 Oct 2016 07:47:52 +0000 (07:47 +0000)]
Refactor "avoid bad wifi" logic into a utility class
am: 065ab6ee40

Change-Id: I4a6ad3791ac551b0d64b37dd4e2afef1e8e8ee10

7 years agoMerge changes from topic 'avoidbadwifi' into nyc-dr1-dev
Lorenzo Colitti [Tue, 4 Oct 2016 07:42:03 +0000 (07:42 +0000)]
Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev

* changes:
  Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
  Slightly simplify IpManager#compareProvisioning.
  Conditionally accept loss of on-link IPv6 DNS servers
  Refactor "avoid bad wifi" logic into a utility class

7 years agoIgnore loss of IPv6 provisioning when not avoiding bad Wi-Fi.
Lorenzo Colitti [Tue, 4 Oct 2016 02:01:19 +0000 (11:01 +0900)]
Ignore loss of IPv6 provisioning when not avoiding bad Wi-Fi.

Bug: 31827713
Change-Id: I81471f2f3e6c1c4d7bdfebc9dd321bb9d76ad0b6

7 years agoSlightly simplify IpManager#compareProvisioning.
Lorenzo Colitti [Mon, 3 Oct 2016 16:38:15 +0000 (01:38 +0900)]
Slightly simplify IpManager#compareProvisioning.

Bug: 31827713
Change-Id: Icc1c8d98feef14c972891451fd94f855d78de43e

7 years agoConditionally accept loss of on-link IPv6 DNS servers
Erik Kline [Mon, 3 Oct 2016 10:53:50 +0000 (19:53 +0900)]
Conditionally accept loss of on-link IPv6 DNS servers

Permit this if and only if we're not "avoiding bad wifi" in general.

Bug: 31827713
Change-Id: I0874ec2d1d09e913ccdbe9f6e178090400808a04

7 years agoRefactor "avoid bad wifi" logic into a utility class
Erik Kline [Sun, 2 Oct 2016 09:02:14 +0000 (18:02 +0900)]
Refactor "avoid bad wifi" logic into a utility class

Additionally, add this utility class to IpManager for compatibility
verification.  A follow-on CL will make use of IpManager's local
AvoidBadWifiTracker.

Bug: 31827713
Change-Id: If8c56c3f8076d6a5157ea180e361bbdadc2bc1dd

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 02:33:30 +0000 (19:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: I47285d5faa82286b22f8bc79198791225deb3923
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 4 Oct 2016 02:21:30 +0000 (19:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia2140f6189db3fbc9e00ea6bc3c33b8d2c90396e
Auto-generated-cl: translation import

7 years agoPrevent any rotation while seamless rotation is pending.
Robert Carr [Tue, 4 Oct 2016 01:13:33 +0000 (18:13 -0700)]
Prevent any rotation while seamless rotation is pending.

Various errors occur when using even the normal rotation animation while
seamless rotation is pending. So we just defer the rotation like we do
for the normal animation. Since we are doing this, we need to track
when seamless rotation finishes so we can perform a post-rotate
rotation if required.

Bug: 31749456
Change-Id: I99f189306c690ce868496460e9ca7dcc95e4ccdc

7 years agoPrevent triggering orientation changes until previous completes.
Robert Carr [Mon, 3 Oct 2016 23:42:04 +0000 (16:42 -0700)]
Prevent triggering orientation changes until previous completes.

Currently we defer rotation while the screen rotation animation
is animating, but there is an additional interval after the animation
completes where the display may not yet be unfrozen and attempting to
rotate again will not work.

Bug: 31749456
Change-Id: I5f6830d85fb326d5032b597cbed1b767f0b627f5

7 years agoAdd "FILTER_NOT_HIDE" to filter out the apps.
jackqdyulei [Thu, 29 Sep 2016 20:31:54 +0000 (13:31 -0700)]
Add "FILTER_NOT_HIDE" to filter out the apps.

The "FILTER_NOT_HIDE" is used to filter out apps that "blacklisted"
by the carrier. So when user insert a specific sim card, these apps
disapper in settings > apps totally unless user enable them.

Bug: 31823872
Test: Manual
Change-Id: I62ec13806d70f68e6cd3cbd014e7513cda36358c

7 years agoMerge "Restrict AVD and VD parsing to the current element instead of the whole docume...
Doris Liu [Mon, 3 Oct 2016 23:28:51 +0000 (23:28 +0000)]
Merge "Restrict AVD and VD parsing to the current element instead of the whole document" into nyc-mr1-dev

7 years agoMerge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev
Tenghui Zhu [Mon, 3 Oct 2016 22:53:42 +0000 (22:53 +0000)]
Merge "Update JavaDoc about animatable on VectorDrawable" into nyc-mr1-dev

7 years agoMerge "Fix thread race caused double free issue." into nyc-mr1-dev
Adam Lesinski [Mon, 3 Oct 2016 21:36:47 +0000 (21:36 +0000)]
Merge "Fix thread race caused double free issue." into nyc-mr1-dev

7 years agoRestrict AVD and VD parsing to the current element instead of the whole document
Doris Liu [Mon, 3 Oct 2016 20:57:28 +0000 (13:57 -0700)]
Restrict AVD and VD parsing to the current element instead of the whole document

This CL changes the AVD xml parsing to parsing only within the current
element, which prevents AVD parsing from always skipping to the end of
the doucment. So things that are defined after AVD in the same document
can be picked up by the xml parser.

The same fix has been applied to VD as well.

BUG: 31865175
Test: Manually following comment #1 in the bug above

Change-Id: I4ebdce1eb2e92d6f6e2c37caed9607253d24602f

7 years agoDocs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10
Bert McMeen [Mon, 3 Oct 2016 21:21:20 +0000 (21:21 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10
am: 19404c6f93

Change-Id: I05c3ee4ee575afc6214a44bbe4a5094287ce3c48

7 years agoDocs: Wear preview 3 - tweaks to gradle snippet
Bert McMeen [Mon, 3 Oct 2016 21:15:42 +0000 (21:15 +0000)]
Docs: Wear preview 3 - tweaks to gradle snippet
am: 70c6411a10

Change-Id: I823d703c307a6ea51b149cac3b6b2864dbc44511

7 years agoMerge "Explicitly close FD binder parameters in backup/restore API calls" into nyc...
Chris Tate [Mon, 3 Oct 2016 21:06:20 +0000 (21:06 +0000)]
Merge "Explicitly close FD binder parameters in backup/restore API calls" into nyc-mr1-dev

7 years agoDocs: Wear preview 3 - tweaks to gradle snippet
Bert McMeen [Mon, 3 Oct 2016 20:32:54 +0000 (13:32 -0700)]
Docs: Wear preview 3 - tweaks to gradle snippet

Bug: 31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424

7 years agoMerge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev
Phil Weaver [Mon, 3 Oct 2016 20:31:20 +0000 (20:31 +0000)]
Merge "Make magnification ignore invisible wallpaper." into nyc-mr1-dev

7 years agoMerge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle servic...
Dianne Hackborn [Mon, 3 Oct 2016 20:21:49 +0000 (20:21 +0000)]
Merge "Fix issue #31403654: Elevation of privilege vulnerability in deviceidle service" into nyc-mr1-dev

7 years agoFix thread race caused double free issue.
songjinshi [Thu, 8 Sep 2016 07:24:30 +0000 (15:24 +0800)]
Fix thread race caused double free issue.

The SharedZip's Asset is not thread-safety,the getResourceTableAsset()
and setResourceTableAsset(Asset* asset) function of the SharedZip is
not sync with a same lock.

Consider the following sequence of events:
Thread A calls setResourceTableAsset(Asset* asset),it will set
mResourceTableAsset = asset; then to calls getBuffer() of the asset.
Thread B calls getResourceTableAsset(),which return mResourceTableAsset,
then to calls getBuffer() of the mResourceTableAsset,the asset and
mResourceTableAsset is same one object.
Thread A to delete mZipInflater in getBuffer().
Thread B to delete mZipInflater in getBuffer().

It will cause crash becuase double delete mZipInflater in getBuffer().

https://code.google.com/p/android/issues/detail?id=211941

Bug:31734545
Change-Id: I5a7d67fdf64c4aa03f505b37a2fa840f4443d158
Signed-off-by: songjinshi <songjinshi@xiaomi.com>
7 years agoMerge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev
TreeHugger Robot [Mon, 3 Oct 2016 18:49:37 +0000 (18:49 +0000)]
Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev

7 years agoDocs: Redirect for Android Studio IR Flight Recorder am: 1face37061
Adarsh Fernando [Mon, 3 Oct 2016 15:57:55 +0000 (15:57 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder am: 1face37061
am: 5fe735fe2c

Change-Id: I1acf26e382b8bbcc505e03873d9be6f1c8306bf7

7 years agoDocs: Redirect for Android Studio IR Flight Recorder
Adarsh Fernando [Mon, 3 Oct 2016 15:53:55 +0000 (15:53 +0000)]
Docs: Redirect for Android Studio IR Flight Recorder
am: 1face37061

Change-Id: Ic7d2eebff72e8118993606e5758ced4f4e9f5e64

7 years agoReload state when user unlocks
Jorim Jaggi [Fri, 30 Sep 2016 14:20:25 +0000 (07:20 -0700)]
Reload state when user unlocks

Test: Unlock freshly booted non-FBE device, make sure the transition
is fast as well as the icons have the correct state

Change-Id: I6427427d16edeceb0f410be0b88de601a3dffdb4
Fixes: 31203310

7 years agoDocs: Redirect for Android Studio IR Flight Recorder
Adarsh Fernando [Sat, 1 Oct 2016 19:23:49 +0000 (12:23 -0700)]
Docs: Redirect for Android Studio IR Flight Recorder

Bug:31631770
Change-Id: Id3c4b8d141242521bef6364af2bbd47b950258c2

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:55:12 +0000 (08:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:51:43 +0000 (08:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 08:51:04 +0000 (08:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 07:19:43 +0000 (00:19 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie8517dd138d533fdfc983725187ffe9f10b4dc2c
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 07:06:44 +0000 (00:06 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8dfdc1a55bbaa0b8f2104959871f9f9f342cdc99
Auto-generated-cl: translation import

7 years agoMerge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3
Hemal Patel [Sat, 1 Oct 2016 01:55:48 +0000 (01:55 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev am: b4be5089f3
am: 14557acbfc

Change-Id: I8595ac0c4e9e14b6c655c0fb2ad88e2801d59abe

7 years agoDocs: Fixed the Service link am: 1918214589
Hemal Patel [Sat, 1 Oct 2016 01:54:45 +0000 (01:54 +0000)]
Docs: Fixed the Service link am: 1918214589
am: eb21088b67

Change-Id: Ia687d1ba27eee87abe412e8a8dd11e49e5f02100

7 years agoMerge "Docs: Fixed the Service link" into nyc-dev
Hemal Patel [Sat, 1 Oct 2016 01:46:01 +0000 (01:46 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev
am: b4be5089f3

Change-Id: Ied25211be5b868b7792d31a89feebf54ee5ad9dd

7 years agoDocs: Fixed the Service link
Hemal Patel [Sat, 1 Oct 2016 01:45:58 +0000 (01:45 +0000)]
Docs: Fixed the Service link
am: 1918214589

Change-Id: Icfd4e033b7ef9bd915f106abc789f11fb4ede301

7 years agoMerge "Docs: Fixed the Service link" into nyc-dev
TreeHugger Robot [Sat, 1 Oct 2016 01:36:11 +0000 (01:36 +0000)]
Merge "Docs: Fixed the Service link" into nyc-dev

7 years agoMerge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 01:21:35 +0000 (01:21 +0000)]
Merge "Implement untetherAll as calls to stopTethering" into nyc-mr1-dev

7 years agoMerge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev
TreeHugger Robot [Sat, 1 Oct 2016 01:21:07 +0000 (01:21 +0000)]
Merge "Notify NetworkPolicyManagerService on tethering changes" into nyc-mr1-dev

7 years agoMake magnification ignore invisible wallpaper.
Phil Weaver [Sat, 1 Oct 2016 01:11:39 +0000 (18:11 -0700)]
Make magnification ignore invisible wallpaper.

Magnification was assuming that all windows for which
isOnScreen() returned true were visible, but that is not
true for at least wallpapers that have been made invisible.
Adding a check for visibility in addition to on screen.

Bug: 7215285
Change-Id: Iadea37c9eec981f1d68c5a42959debb58cbab264

7 years agoExplicitly close FD binder parameters in backup/restore API calls
Christopher Tate [Sat, 1 Oct 2016 00:52:19 +0000 (17:52 -0700)]
Explicitly close FD binder parameters in backup/restore API calls

CloseGuard is grateful.

Bug 30893100

Change-Id: Ia6bd4d88204839add59d9d245aad673d67b11bea

7 years agoImport translations. DO NOT MERGE
Bill Yi [Sat, 1 Oct 2016 00:38:43 +0000 (17:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7fdd11e47d67879376ace9d33de1a7add58ae133
Auto-generated-cl: translation import

7 years agoAdd metrics logging for critical fingerprintd errors
Jim Miller [Sat, 1 Oct 2016 00:17:59 +0000 (17:17 -0700)]
Add metrics logging for critical fingerprintd errors

This adds logging when fingerprintd dies or invoked functions
fail so we can track driver breakage:

- failure to start fingerprintd (fingerprintd_openhal_error)
- fingerprintd dies (fingerprintd_died)
- call to authenticate/enroll/enumerate/remove fails

Fixes bug 30896409

Change-Id: Ic53fcd551ba909ef141893796b33b52cd5e56395

7 years agoMerge "Do not access MTP devices when disabled." into nyc-mr1-dev
Philip P. Moltmann [Sat, 1 Oct 2016 00:16:09 +0000 (00:16 +0000)]
Merge "Do not access MTP devices when disabled." into nyc-mr1-dev

7 years agoMerge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc...
Dianne Hackborn [Fri, 30 Sep 2016 23:27:33 +0000 (23:27 +0000)]
Merge "Work on issue #29422027: APR: Runtime restarts in system_server" into nyc-mr1-dev

7 years agoMerge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev
Tao Bao [Fri, 30 Sep 2016 23:07:34 +0000 (23:07 +0000)]
Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev

7 years agoMerge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 23:05:46 +0000 (23:05 +0000)]
Merge "SurfaceView only call forceDisconnect if isValid" into nyc-mr1-dev

7 years agoMerge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68
Hemal Patel [Fri, 30 Sep 2016 22:49:43 +0000 (22:49 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev am: 91690d0c68
am: 3b097c9980

Change-Id: I0b7923ca2f6bd6b4dffe3e535d89d3a42697b8ee

7 years agoDocs: Fixed the code sample am: a80822a98b
Hemal Patel [Fri, 30 Sep 2016 22:48:41 +0000 (22:48 +0000)]
Docs: Fixed the code sample am: a80822a98b
am: 313b1d7310

Change-Id: I225d1eafeacf85a19c86c28b413e550c824a8282

7 years agoMerge "Docs: Fixed the code sample" into nyc-dev
Hemal Patel [Fri, 30 Sep 2016 22:42:15 +0000 (22:42 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev
am: 91690d0c68

Change-Id: I3f6874ac6b77782f49f566641ad9c3cc4df3979c

7 years agoDocs: Fixed the code sample
Hemal Patel [Fri, 30 Sep 2016 22:42:12 +0000 (22:42 +0000)]
Docs: Fixed the code sample
am: a80822a98b

Change-Id: Ib8146f5e2817e13caf9cc8f91e47423356423d8e

7 years agoMerge "Docs: Fixed the code sample" into nyc-dev
Hemal Patel [Fri, 30 Sep 2016 22:27:53 +0000 (22:27 +0000)]
Merge "Docs: Fixed the code sample" into nyc-dev

7 years agoDo not access MTP devices when disabled.
Philip P. Moltmann [Fri, 30 Sep 2016 21:58:27 +0000 (14:58 -0700)]
Do not access MTP devices when disabled.

The USB data transfer is disabled we should not allow access MTP devices
(e.g.
usb sticks). We have two ways of accessing them: Either by mounting them
or by creating a MTPDevice in an app.

Of course an app could implement implement their own MTPDevice
implementation. In this case we cannot enforce the policy without
completely suppressing all MTP USB devices which would be too
restrictive.

Note: When the policy is set we do _not_ disconnect already connected
MTP devices

Fixes: 31472955
Change-Id: I6080c48c49657102774b2b3b4d89ff030245a266

7 years agoMerge "Increase char limit for string." into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 22:23:18 +0000 (22:23 +0000)]
Merge "Increase char limit for string." into nyc-mr1-dev

7 years agoDocs: Fixed the Service link
Hemal Patel [Fri, 30 Sep 2016 21:59:23 +0000 (14:59 -0700)]
Docs: Fixed the Service link

Bug: 29086415
Change-Id: Id9505ade39c19eb817f556d72f689568148e1782

7 years agoMerge "Docs: Updates to backup documentation" into nyc-dev am: d93a31bbe0
Mark Lu [Fri, 30 Sep 2016 21:57:15 +0000 (21:57 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev am: d93a31bbe0
am: 6bd0c689e9

Change-Id: I7b3e73ff2664388e585e59b96d09f184b73c2ba6

7 years agoDocs: Updates to backup documentation am: f0968050f6
Mark Lu [Fri, 30 Sep 2016 21:56:06 +0000 (21:56 +0000)]
Docs: Updates to backup documentation am: f0968050f6
am: 0109b0f83a

Change-Id: Ib966eb7e733064344d10c2c70ee97e995edb7a5d

7 years agoMerge "Docs: Updates to backup documentation" into nyc-dev
Mark Lu [Fri, 30 Sep 2016 21:49:28 +0000 (21:49 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev
am: d93a31bbe0

Change-Id: I852b6a74f0be30a063c30bdb82553ba80f2717fe

7 years agoDocs: Updates to backup documentation
Mark Lu [Fri, 30 Sep 2016 21:49:23 +0000 (21:49 +0000)]
Docs: Updates to backup documentation
am: f0968050f6

Change-Id: I6364318aca4e56dc72a049d20b5cab99190d7ed4

7 years agoDocs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529
David Friedman [Fri, 30 Sep 2016 21:45:35 +0000 (21:45 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs. am: a9c3a0b529
am: b25c08fa32

Change-Id: I4c8f976ab1f679179f2b3221d8889088309bfdc0

7 years agoMerge "Docs: Updates to backup documentation" into nyc-dev
Mark Lu [Fri, 30 Sep 2016 21:40:28 +0000 (21:40 +0000)]
Merge "Docs: Updates to backup documentation" into nyc-dev

7 years agoDocs: Minor TOC and link fixes for newly released iteration of Perf docs.
David Friedman [Fri, 30 Sep 2016 21:39:35 +0000 (21:39 +0000)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs.
am: a9c3a0b529

Change-Id: I60cd53d9a3a70c7f16a52bb7358b90f01833c118

7 years agoSurfaceView only call forceDisconnect if isValid
John Reck [Fri, 30 Sep 2016 21:30:04 +0000 (14:30 -0700)]
SurfaceView only call forceDisconnect if isValid

Change-Id: I683c2f937f44d8b3d912839a3e91cbd5b5c7f437
Fixes: 31778946
Test: Manual, launch Cookie Jam then tap recents

7 years agoDocs: Minor TOC and link fixes for newly released iteration of Perf docs.
David Friedman [Fri, 30 Sep 2016 21:25:45 +0000 (14:25 -0700)]
Docs: Minor TOC and link fixes for newly released iteration of Perf docs.

Change-Id: I61a9477ae129138932d4da29253bc2e6ece8357d

7 years agoDocs: Updates to backup documentation
Mark Lu [Fri, 30 Sep 2016 01:11:38 +0000 (18:11 -0700)]
Docs: Updates to backup documentation

Change-Id: I9349e5f8585687b1159f13029b6c13b89dafd8c9

7 years agoMerge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev...
Cheryl Potter [Fri, 30 Sep 2016 19:27:25 +0000 (19:27 +0000)]
Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev am: c14495eb9a
am: c6845ca160

Change-Id: I1fb13ba2d5914b62720ee0e34dcc803d8de527d9

7 years agodocs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4
Cheryl Potter [Fri, 30 Sep 2016 19:26:28 +0000 (19:26 +0000)]
docs: help button redirects, see go/AS-help-buttons b/31810305 am: 27d595a5e4
am: 53e56f7331

Change-Id: I731c1268f0981693320b7fc3ce8248afc0889c72

7 years agoMerge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev
Cheryl Potter [Fri, 30 Sep 2016 19:20:59 +0000 (19:20 +0000)]
Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev
am: c14495eb9a

Change-Id: I1168ba71a0c63a27b0cb7ee72b88bbd2669da1df

7 years agodocs: help button redirects, see go/AS-help-buttons b/31810305
Cheryl Potter [Fri, 30 Sep 2016 19:20:56 +0000 (19:20 +0000)]
docs: help button redirects, see go/AS-help-buttons b/31810305
am: 27d595a5e4

Change-Id: I18d87344d5ec42f8b3e2784f04feaf419ad9eb03

7 years agoMerge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev
TreeHugger Robot [Fri, 30 Sep 2016 19:13:23 +0000 (19:13 +0000)]
Merge "docs: help button redirects, see go/AS-help-buttons b/31810305" into nyc-dev

7 years agoMerge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83
Joe Fernandez [Fri, 30 Sep 2016 19:04:46 +0000 (19:04 +0000)]
Merge "Docs: Added info about vector drawable" into nyc-dev am: a86fbb9c83
am: d99744e99e

Change-Id: I4e558e9c1b9411dccacf39be75ac525d1ee4a9c7

7 years agoDocs: Added info about vector drawable am: 47876e79de
Hemal Patel [Fri, 30 Sep 2016 19:03:53 +0000 (19:03 +0000)]
Docs: Added info about vector drawable am: 47876e79de
am: bfa9663e97

Change-Id: I5649e6f9f0e6254d43e7229ef3e88b40351b14e5

7 years agoMerge "Docs: Added info about vector drawable" into nyc-dev
Joe Fernandez [Fri, 30 Sep 2016 18:59:14 +0000 (18:59 +0000)]
Merge "Docs: Added info about vector drawable" into nyc-dev
am: a86fbb9c83

Change-Id: I8e3961855d46a2628dc4a8848b6e01caadd3a008

7 years agoDocs: Added info about vector drawable
Hemal Patel [Fri, 30 Sep 2016 18:59:09 +0000 (18:59 +0000)]
Docs: Added info about vector drawable
am: 47876e79de

Change-Id: I73d39d61210064e9de4ec212fac51a43e7a791ae

7 years agoMerge "Docs: Added info about vector drawable" into nyc-dev
Joe Fernandez [Fri, 30 Sep 2016 18:51:16 +0000 (18:51 +0000)]
Merge "Docs: Added info about vector drawable" into nyc-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-dr1-dev
Bill Yi [Fri, 30 Sep 2016 18:45:24 +0000 (18:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: d65fc69f4e  -s ours

Change-Id: I2857f19f1a47419aaf133b4c771d9da7d905357b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 30 Sep 2016 18:45:21 +0000 (18:45 +0000)]
Import translations. DO NOT MERGE
am: 780931dd46  -s ours

Change-Id: I704c75e6c47dfbca42026953ff92de50612cec1e

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-dr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 18:39:05 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev

7 years agoMerge "QS: Fix RTL handling for listening" into nyc-mr1-dev
Jason Monk [Fri, 30 Sep 2016 18:32:51 +0000 (18:32 +0000)]
Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev

7 years agodocs: help button redirects, see go/AS-help-buttons
Cheryl Potter [Fri, 30 Sep 2016 17:57:35 +0000 (10:57 -0700)]
docs: help button redirects, see go/AS-help-buttons
b/31810305

Change-Id: I9574ab873df6bec23910ae19f0a3b88afc60318e

7 years agoMerge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev...
Android Build Merger (Role) [Fri, 30 Sep 2016 17:49:45 +0000 (17:49 +0000)]
Merge "Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d am: 76ae4deb63" into nyc-mr1-dev

7 years agoMerge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b...
Eric Schmidt [Fri, 30 Sep 2016 17:49:09 +0000 (17:49 +0000)]
Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev am: 64d0b4510d
am: 76ae4deb63

Change-Id: Ia2d18912b3125363ea6eee3a770970978c2084dc

7 years agoMerge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am:...
Android Build Merger (Role) [Fri, 30 Sep 2016 17:48:52 +0000 (17:48 +0000)]
Merge "docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73 am: b6a21f7617" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 30 Sep 2016 17:48:19 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agodocs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73
Eric Schmidt [Fri, 30 Sep 2016 17:48:14 +0000 (17:48 +0000)]
docs: Broken at link in Memory article. am: 0046284c0f am: 9b91c3ec73
am: b6a21f7617

Change-Id: I3da664bbe08476d82c6d3f5813b4493d0027df7b

7 years agoMerge "docs: Updated wording on auto playback app requirement." into nyc-dev am:...
Sreevani Sreejith [Fri, 30 Sep 2016 17:47:16 +0000 (17:47 +0000)]
Merge "docs: Updated wording on auto playback app requirement." into nyc-dev am: f8c8a636d2
am: 4df99e77af

Change-Id: I488f489858cd288471532aa983c7ad3340d6045a

7 years agodocs: Updated wording on auto playback app requirement. am: d4fa870a6a
sreevanis [Fri, 30 Sep 2016 17:46:19 +0000 (17:46 +0000)]
docs: Updated wording on auto playback app requirement. am: d4fa870a6a
am: 072d47bf61

Change-Id: I6a8b9f3a8e5c789283a84bcfe93f262319fe8eb9

7 years agoMerge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev
Eric Schmidt [Fri, 30 Sep 2016 17:40:16 +0000 (17:40 +0000)]
Merge "docs: Broken at link in Memory article. am: 0046284c0f" into nyc-dev
am: 64d0b4510d

Change-Id: I81c74feaefdc165dedb30f109f5ddf7da628d640