OSDN Git Service

android-x86/frameworks-base.git
8 years agoFix deadlock when updating rotation
Chong Zhang [Fri, 28 Aug 2015 17:22:36 +0000 (10:22 -0700)]
Fix deadlock when updating rotation

Post a runnable in MyOrientationListener.onProposedRotationChanged for
the updateRotation() so that it doesn't acquire WM lock while holding
WindowOrientationListener lock. It could cause deadlock if WM is
is performing a relayout and try to access WindowOrientationListener.

bug: 23507268
Change-Id: I5775f5a13cae0283fef64877801bf8a39dfc90a4

8 years agoam d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
Nicolas Prevot [Tue, 25 Aug 2015 17:39:24 +0000 (17:39 +0000)]
am d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.

* commit 'd34ecae444867b78be06bb5a6b0fb2a66c2e30aa':
  Don't set a null filter to a cross-profile ResolveInfo.

8 years agoMerge "instrument fingerprint crypto token service" into mnc-dr-dev
Chris Wren [Tue, 25 Aug 2015 14:10:20 +0000 (14:10 +0000)]
Merge "instrument fingerprint crypto token service" into mnc-dr-dev

8 years agoDon't set a null filter to a cross-profile ResolveInfo.
Nicolas Prevot [Tue, 25 Aug 2015 12:01:43 +0000 (13:01 +0100)]
Don't set a null filter to a cross-profile ResolveInfo.

ResolverActivity expects the filter not to be null.

BUG:23395395
Change-Id: Ie7081daba1ad138b1a3903ef9dd1b649806c8d0e

8 years agoScale notifications on lockscreen for 420 dpi devices
Jorim Jaggi [Mon, 24 Aug 2015 21:52:45 +0000 (14:52 -0700)]
Scale notifications on lockscreen for 420 dpi devices

Bug: 23299488
Change-Id: Ied4505532aad41a3a1469efce2464a491661fb6c

8 years agoam 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices...
Eino-Ville Talvala [Mon, 24 Aug 2015 23:12:16 +0000 (23:12 +0000)]
am 2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev

* commit '2bf7b98a2ade8b3fe25143fa9ef94f2266a908dd':
  Camera2: Remove filtering for non-BURST_CAPTURE-capable devices

8 years agoMerge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
Eino-Ville Talvala [Mon, 24 Aug 2015 23:08:00 +0000 (23:08 +0000)]
Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev

8 years agoFix issues with light status bar and fp wake-and-unlock
Jorim Jaggi [Fri, 21 Aug 2015 23:52:55 +0000 (16:52 -0700)]
Fix issues with light status bar and fp wake-and-unlock

- When wake-and-unlocking, make sure to skip the light status bar
transition.
- Fix race condition with window manager when unlocking when device
is interactive for supplying the timings for the light status bar
transition.
- Fix media artwork when wake-and-unlocking while pulsing.

Bug: 23365544
Change-Id: I209ca1e6684811f5f313354ca1614a0ebd49388c

8 years agoam def6896d: Fix shifted wallpaper after OTA
Adrian Roos [Mon, 24 Aug 2015 21:41:43 +0000 (21:41 +0000)]
am def6896d: Fix shifted wallpaper after OTA

* commit 'def6896d10ce4869831bf91eb73709e8a9714b27':
  Fix shifted wallpaper after OTA

8 years agoCamera2: Remove filtering for non-BURST_CAPTURE-capable devices
Eino-Ville Talvala [Mon, 24 Aug 2015 21:06:12 +0000 (14:06 -0700)]
Camera2: Remove filtering for non-BURST_CAPTURE-capable devices

Devices that do not support the BURST_CAPTURE capability do not
get the split resolution lists. However, one spot in the stream
configuration map enumeration did not guard against this properly.

As a result, the category of devices that are not-BURST-CAPABLE and
do list resolutions that operate at a 'slow' (<= 20fps) rates cause
an assert to fire from an apparently-inconsistent size list.

Guard the filtering correctly, to correctly support such
devices.

Bug: 23489536
Change-Id: Ib026f6555c69b7fac0cd1ea5027d598644cd8701

8 years agoFix shifted wallpaper after OTA
Adrian Roos [Mon, 24 Aug 2015 20:39:11 +0000 (13:39 -0700)]
Fix shifted wallpaper after OTA

Fixes a bug where WindowManager's and SurfaceFlinger's
view of the wallpaper's position could get out of sync.

Bug: 13020924
Change-Id: Iad17b0f516fffacd2877ceac40fcc8e2647c06b2

8 years agoRemove window from mWaitingForDrawn when policy hidden
Jorim Jaggi [Sat, 22 Aug 2015 00:07:09 +0000 (17:07 -0700)]
Remove window from mWaitingForDrawn when policy hidden

When doing a wake-and-unlock sequence and the app underneath hides
the status bar, we are dismissing Keyguard, the app gets focus, the
app hides the status bar BUT we haven't finished drawn yet, so we
are waiting until the timeout because w.hasDrawnLw() always returns
false. Remove window from pending list if it gets policy hidden.

Bug: 23431343
Change-Id: I27e8c6d4efb435a4d3b632a4a37c0de5b021c2e7

8 years agoam c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into...
Joe Fernandez [Mon, 24 Aug 2015 20:30:20 +0000 (20:30 +0000)]
am c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev

* commit 'c550a6fa945c0eeb5d766d0a54a50af54eddd67f':
  docs: Add Studio 1.3.2 release notes and download links

8 years agoMerge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
Joe Fernandez [Mon, 24 Aug 2015 20:25:04 +0000 (20:25 +0000)]
Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev

8 years agodocs: Add Studio 1.3.2 release notes and download links
Joe Fernandez [Fri, 21 Aug 2015 00:11:56 +0000 (17:11 -0700)]
docs: Add Studio 1.3.2 release notes and download links

- Added Studio 1.3.2 release notes
- Added Studio 1.3.2 download link information
- Added ADT 23.0.7 release notes (catch up from 8/17)

Change-Id: I930059d9bf85f7063eb3f55e0c77d46a064c75b0

8 years agoinstrument fingerprint crypto token service
Chris Wren [Mon, 24 Aug 2015 20:19:03 +0000 (16:19 -0400)]
instrument fingerprint crypto token service

Histogram counts number of calls with and without a token.

Bug: 22951001
Change-Id: Idaabee389bfa33eb009d48bb9a0edae146bcc217

8 years agoMerge "Camera: Add support for notifying NFC stack when camera is active" into mnc...
Eino-Ville Talvala [Mon, 24 Aug 2015 19:22:04 +0000 (19:22 +0000)]
Merge "Camera: Add support for notifying NFC stack when camera is active" into mnc-dr-dev

8 years agoMerge "Don't show roaming icon when connecting HT HR network with Tele2 SIM" into...
Vineeta Srivastava [Mon, 24 Aug 2015 19:00:27 +0000 (19:00 +0000)]
Merge "Don't show roaming icon when connecting HT HR network with Tele2 SIM" into mnc-dr-dev

8 years agoam c04d21fc: Merge "add placeholder for platform name in download button. This change...
Scott Main [Mon, 24 Aug 2015 16:41:22 +0000 (16:41 +0000)]
am c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev

* commit 'c04d21fc4ec66d34ca5395db59fadc5e4626bb1c':
  add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/

8 years agoMerge "add placeholder for platform name in download button. This change depends...
Scott Main [Mon, 24 Aug 2015 16:34:35 +0000 (16:34 +0000)]
Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" into mnc-dev

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Aug 2015 16:04:11 +0000 (11:04 -0500)]
Import translations. DO NOT MERGE

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

8 years agoDon't show roaming icon when connecting HT HR network with Tele2 SIM
Sungmin Choi [Mon, 17 Aug 2015 21:15:37 +0000 (14:15 -0700)]
Don't show roaming icon when connecting HT HR network with Tele2 SIM

Bug: 23263661
Change-Id: Idcc52d53f7d7860ca561688ea311fdf50f3447b2

8 years agoam 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL...
Eino-Ville Talvala [Sat, 22 Aug 2015 05:38:01 +0000 (05:38 +0000)]
am 08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev

* commit '08b12dfba630659601972f0d857b6580fdae4313':
  Camera2: Legacy: Lock down surface sizes before creating EGL surfaces

8 years agoMerge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into...
Eino-Ville Talvala [Sat, 22 Aug 2015 05:33:26 +0000 (05:33 +0000)]
Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev

8 years agoMerge "Fix jank when clicking on HUN" into mnc-dr-dev
Jorim Jaggi [Sat, 22 Aug 2015 01:10:17 +0000 (01:10 +0000)]
Merge "Fix jank when clicking on HUN" into mnc-dr-dev

8 years agoCamera: Add support for notifying NFC stack when camera is active
Eino-Ville Talvala [Thu, 20 Aug 2015 22:43:57 +0000 (15:43 -0700)]
Camera: Add support for notifying NFC stack when camera is active

On some devices, NFC full poll operation and camera operation
interfere.  Add a system property ro.camera.notify_nfc.  When set to >
0, the NFC adapter will be notified to disable polling whenever the
camera is active.

Bug: 23393557
Change-Id: I7e22018900970cbbd3d34bd8b3974e0b1cc98a8d

8 years agoam 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()"...
Andrew Solovay [Sat, 22 Aug 2015 00:36:54 +0000 (00:36 +0000)]
am 9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev

* commit '9520071b983e2ca61160f580e0be3fe24d305760':
  docs: Fix return info for support lib checkSelfPermission()

8 years agoMerge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
Andrew Solovay [Sat, 22 Aug 2015 00:30:59 +0000 (00:30 +0000)]
Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev

8 years agoam a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
Eino-Ville Talvala [Sat, 22 Aug 2015 00:25:38 +0000 (00:25 +0000)]
am a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev

* commit 'a7dde2e89ec9a8c0ce5460d4f57d1e561f16520f':
  Camera: Fix depth documentation issues

8 years agoMerge "Camera: Fix depth documentation issues" into mnc-dev
Eino-Ville Talvala [Sat, 22 Aug 2015 00:14:13 +0000 (00:14 +0000)]
Merge "Camera: Fix depth documentation issues" into mnc-dev

8 years agoam d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
Glenn Kasten [Fri, 21 Aug 2015 23:32:32 +0000 (23:32 +0000)]
am d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev

* commit 'd9eef3478ae2bea4d943082aaefd1a4a91a30600':
  MIDI docs: fix buffer allocation

8 years agoCamera2: Legacy: Lock down surface sizes before creating EGL surfaces
Eino-Ville Talvala [Fri, 21 Aug 2015 23:30:27 +0000 (16:30 -0700)]
Camera2: Legacy: Lock down surface sizes before creating EGL surfaces

This ensures that sizes don't change after being initially inspected,
and/or stale size information isn't reused incorrectly.

Bug: 22092273
Change-Id: I5b26ea53977da4c1412e476d06d94aa791846393

8 years agoMerge "MIDI docs: fix buffer allocation" into mnc-dev
Glenn Kasten [Fri, 21 Aug 2015 23:27:08 +0000 (23:27 +0000)]
Merge "MIDI docs: fix buffer allocation" into mnc-dev

8 years agoam 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code...
Cheryl Potter [Fri, 21 Aug 2015 23:12:47 +0000 (23:12 +0000)]
am 41fc973c: am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit '41fc973c144287c010d6219ab82f2640ebaff9dc':
  docs: changed red to yellow in code snippet

8 years agoam e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
Fyodor Kupolov [Fri, 21 Aug 2015 23:12:43 +0000 (23:12 +0000)]
am e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev

* commit 'e6c64508aba566b5bd4ac9cd87a07358b13f5a06':
  Fixed a typo in convertRestrictionsToBundle JavaDoc

8 years agoam 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into...
Cheryl Potter [Fri, 21 Aug 2015 23:08:00 +0000 (23:08 +0000)]
am 251f2479: am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit '251f24790757cf38bffbd6cec06c6503f99299dd':
  docs: changed red to yellow in code snippet

8 years agoMerge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
Fyodor Kupolov [Fri, 21 Aug 2015 23:04:09 +0000 (23:04 +0000)]
Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev

8 years agoam dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview...
Cheryl Potter [Fri, 21 Aug 2015 23:01:17 +0000 (23:01 +0000)]
am dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

* commit 'dc35d48f4fdc2016f900207ebc934e5a57bd9265':
  docs: changed red to yellow in code snippet

8 years agoMerge "Invoke strong auth callback and default strong auth expired to true" into...
Adrian Roos [Fri, 21 Aug 2015 22:59:43 +0000 (22:59 +0000)]
Merge "Invoke strong auth callback and default strong auth expired to true" into mnc-dr-dev

8 years agoMerge "docs: changed red to yellow in code snippet" into mnc-preview-docs
Cheryl Potter [Fri, 21 Aug 2015 22:51:30 +0000 (22:51 +0000)]
Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs

8 years agoam 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
Jim Miller [Fri, 21 Aug 2015 22:11:30 +0000 (22:11 +0000)]
am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

* commit '74d9c2aad1bcd52933a8dba7752b28e9aef1902d':
  Fix type-o in FingerprintManager documentation

8 years agoMerge "Fix type-o in FingerprintManager documentation" into mnc-dev
Jim Miller [Fri, 21 Aug 2015 21:59:51 +0000 (21:59 +0000)]
Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

8 years agoMerge "Add support for new window orientation sensor." into mnc-dr-dev
Trevor Bunker [Fri, 21 Aug 2015 21:14:00 +0000 (21:14 +0000)]
Merge "Add support for new window orientation sensor." into mnc-dr-dev

8 years agoInvoke strong auth callback and default strong auth expired to true
Adrian Roos [Wed, 19 Aug 2015 23:52:52 +0000 (16:52 -0700)]
Invoke strong auth callback and default strong auth expired to true

Split off from I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b.

The initial value did not matter previously because
a SystemUI crash triggered the boot logic and forced
a manual entry before fingerprint works.

Long term the timeout logic should be moved to StrongAuthTracker
so it can be shared with the trust agent implementation (currently
implemented by the trust agents themeselfes)

Bug: 22846469
Bug: 22115393
Change-Id: I0af11da1b7cd7c8d837bc5ba3a62ef2ffca74b1b

8 years agoAdd StrongAuthTracker
Adrian Roos [Fri, 14 Aug 2015 22:53:06 +0000 (15:53 -0700)]
Add StrongAuthTracker

Bug: 22846469
Bug: 22115393
Change-Id: I6ef5322d02e540fc043e7f20d3aabf595ce7c224

8 years agoFix jank when clicking on HUN
Jorim Jaggi [Thu, 20 Aug 2015 02:50:49 +0000 (19:50 -0700)]
Fix jank when clicking on HUN

There is jank at the beginning of the transition when the heads-up
disappears when clicking, because a lot of stuff is going on. In
order to make it consistent with other notification clicks in the
shade, introduce a delay for the disappear animation.

Bug: 23365512
Change-Id: Ib7c5db552d6803f96374198c2af38cf8236769cd

8 years agoMake wake-and-unlock faster
Jorim Jaggi [Thu, 20 Aug 2015 23:59:44 +0000 (16:59 -0700)]
Make wake-and-unlock faster

- Scrims: When dismissing Keyguard, don't wait until the next frame
to start the animation. Saves 16ms
- Scrims: Skip first frame, because it's completely black anyways.
Saves 16ms.
- Don't wait with navigation bar to show until the screen has turned
on. Window manager is blocked on DisplayPowerController anyways, so
the animation will exactly be started when the screen turns on. Fixes
some jank as well.
- Window manager: Don't wait for the window below Keyguard for draw
completion until turning on screen. Saves a lot of time depending on
how the app is behaving.

Bug: 23401557
Change-Id: I9734f9a12143f0e3c0647e9aa066831a29a6de63

8 years agoFix fingerprint listening state race conditions
Jorim Jaggi [Fri, 21 Aug 2015 01:20:02 +0000 (18:20 -0700)]
Fix fingerprint listening state race conditions

When calling cancel() on the cancellation signal, it doesn't happen
immediately. Now, because of a state messup during boot, we go
through the sequence

startListeningForFingerprint
stopListeningForFingerprint
startListeningForFingerprint

However, the cancellation callback from stopListeningForFingeprint
happened AFTER the second startListeningForFingerprint, so we assumed
that fingerprint detection was not running anymore but in reality it
was - leading to weird states and all kinds of small state messups.

Introduce a state machine to track when we we called cancel but
waiting for the confirmation of FingerprintService in order to track
this properly.

Bug: 23380500
Change-Id: I403479fb749cf7c22b73611b69698e8b771777d0

8 years agoFixed a typo in convertRestrictionsToBundle JavaDoc
Fyodor Kupolov [Fri, 21 Aug 2015 18:25:55 +0000 (11:25 -0700)]
Fixed a typo in convertRestrictionsToBundle JavaDoc

Bug: 23408097
Change-Id: Ie06c33aa7b9a953dec645d1763e27dcb506764f0

8 years agoam cb59747d: Merge "Add missing removed permissions to the platform manifest" into...
Svetoslav Ganov [Fri, 21 Aug 2015 12:41:29 +0000 (12:41 +0000)]
am cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev

* commit 'cb59747de7222bc7310162c4174f7b460c34adef':
  Add missing removed permissions to the platform manifest

8 years agoMerge "Add missing removed permissions to the platform manifest" into mnc-dev
Svetoslav Ganov [Fri, 21 Aug 2015 12:34:37 +0000 (12:34 +0000)]
Merge "Add missing removed permissions to the platform manifest" into mnc-dev

8 years agoam 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e...
Sebastien Hertz [Fri, 21 Aug 2015 11:14:23 +0000 (11:14 +0000)]
am 7cd2d343: am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '7cd2d3431c157fa20576e84a8a9f04ba4f7e1dd9':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b1...
Sebastien Hertz [Fri, 21 Aug 2015 11:10:18 +0000 (11:10 +0000)]
am 852c6178: (-s ours) am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '852c6178629d3bdcd7d2c958379b0b71539f460f':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0dd...
Sebastien Hertz [Fri, 21 Aug 2015 11:02:27 +0000 (11:02 +0000)]
am b63e291d: am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit 'b63e291d05aa9522b2ef9b399936c52079820c3f':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ce...
Sebastien Hertz [Fri, 21 Aug 2015 10:53:07 +0000 (10:53 +0000)]
am 88556ac2: am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '88556ac22157ddfe154be6ee7c8853e0a81dc83c':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow...
Sebastien Hertz [Fri, 21 Aug 2015 10:37:46 +0000 (10:37 +0000)]
am 599dc2bd: am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '599dc2bd1c809ae5a413fc3800fc3fbb71432de6':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only...
Sebastien Hertz [Fri, 21 Aug 2015 10:29:30 +0000 (10:29 +0000)]
am 50af68e7: am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '50af68e74a756d0fc81eda2a3580dbcf70362d42':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked...
Sebastien Hertz [Fri, 21 Aug 2015 10:18:38 +0000 (10:18 +0000)]
am 55f86b18: (-s ours) am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '55f86b1811f0411a5d685d6c97772b846a706e19':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT...
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
Sebastien Hertz [Fri, 21 Aug 2015 10:03:51 +0000 (10:03 +0000)]
am c5151d2c: am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'c5151d2c378e4dad4d1312caf2021d7515297d06':
  Allow debugging only for apps forked from zygote

8 years agoam 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE

* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE

8 years agoam b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
Sebastien Hertz [Fri, 21 Aug 2015 09:49:11 +0000 (09:49 +0000)]
am b60bc0ec: resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

* commit 'b60bc0ece2b2714845eff37c97cb19d41a308122':
  Allow debugging only for apps forked from zygote

8 years agoresolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
Sebastien Hertz [Fri, 21 Aug 2015 07:53:41 +0000 (09:53 +0200)]
resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev

Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39

8 years agoam 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from...
Sebastien Hertz [Fri, 21 Aug 2015 07:19:10 +0000 (07:19 +0000)]
am 87a786af: am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote

* commit '87a786afdba8ec94036c62fb58265d364a7064ae':
  Allow debugging only for apps forked from zygote

8 years agoam 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:08:43 +0000 (07:08 +0000)]
am 445ab7fa: am ff8dc212: Allow debugging only for apps forked from zygote

* commit '445ab7fa43f32ac1a256b15f5ab2bd619e9711e4':
  Allow debugging only for apps forked from zygote

8 years agoam ff8dc212: Allow debugging only for apps forked from zygote
Sebastien Hertz [Fri, 21 Aug 2015 07:01:02 +0000 (07:01 +0000)]
am ff8dc212: Allow debugging only for apps forked from zygote

* commit 'ff8dc21278b19b22ed8dc9f9475850838336d351':
  Allow debugging only for apps forked from zygote

8 years agoam ddc2536d: Make sure to kill restore-at-install full-data targets after restore
Christopher Tate [Thu, 20 Aug 2015 23:09:39 +0000 (23:09 +0000)]
am ddc2536d: Make sure to kill restore-at-install full-data targets after restore

* commit 'ddc2536d2b6f277a7828278a066be874e4f9502e':
  Make sure to kill restore-at-install full-data targets after restore

8 years agoAdd support for new window orientation sensor.
Michael Wright [Mon, 17 Aug 2015 22:31:55 +0000 (23:31 +0100)]
Add support for new window orientation sensor.

If we have a window orientation sensor available then we can defer
our orientation calculation to it and potentially let the AP go into
XO shutdown.

By default we'll use the typical accelerometer-based sensor unless
the device tells us the name of the sensor to look for.

Bug: 23038651
Change-Id: I94f02e0639956a7a6a3ab85710aa0f2537fbf7f3

8 years agoMake sure to kill restore-at-install full-data targets after restore
Christopher Tate [Thu, 20 Aug 2015 19:30:50 +0000 (12:30 -0700)]
Make sure to kill restore-at-install full-data targets after restore

Specifically: correctly distinguish the "I want to restore my own data"
case, in which the app is intentionally not killed, from the single-package
restore at install operation.

Bug 23357388

Change-Id: Ic50ac39fe942af1f6ec9e04a32d81a39b70a0b2b

8 years agoam 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev
Alan Viverette [Thu, 20 Aug 2015 20:38:24 +0000 (20:38 +0000)]
am 54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

* commit '54c807e713c0d04134108b7d13e4abd467e318d5':
  Translate ripple mask to account for drawable bounds

8 years agoMerge "Translate ripple mask to account for drawable bounds" into mnc-dev
Alan Viverette [Thu, 20 Aug 2015 20:31:27 +0000 (20:31 +0000)]
Merge "Translate ripple mask to account for drawable bounds" into mnc-dev

8 years agoTranslate ripple mask to account for drawable bounds
Alan Viverette [Thu, 20 Aug 2015 20:27:21 +0000 (16:27 -0400)]
Translate ripple mask to account for drawable bounds

Bug: 23354529
Change-Id: Iaa4fde6b37645492cf902f141f975bdef8e7e14e

8 years agoam 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
Fyodor Kupolov [Thu, 20 Aug 2015 19:53:29 +0000 (19:53 +0000)]
am 1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev

* commit '1773ded84684593f459b19f3271d471b38f14f85':
  Fixed key comparison in equals method

8 years agoMerge "Fixed key comparison in equals method" into mnc-dev
Fyodor Kupolov [Thu, 20 Aug 2015 19:47:38 +0000 (19:47 +0000)]
Merge "Fixed key comparison in equals method" into mnc-dev

8 years agoam 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs...
David Friedman [Thu, 20 Aug 2015 18:07:18 +0000 (18:07 +0000)]
am 46eddef4: am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '46eddef4d46e11269c4f13d695c46cdd7f071a34':
  Docs: Fixes to interactive-watch-face docs (CL 743190)

8 years agoam 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
David Friedman [Thu, 20 Aug 2015 17:53:49 +0000 (17:53 +0000)]
am 504623e1: am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf':
  Docs: Fixes to interactive-watch-face docs (CL 743190)

8 years agoFixed key comparison in equals method
Fyodor Kupolov [Thu, 20 Aug 2015 17:20:34 +0000 (10:20 -0700)]
Fixed key comparison in equals method

Bug: 23376695
Change-Id: Ie4bd55a88f5f86fd8de7b087d0a5f1755951e90d

8 years agoMerge "Add carrier config variable to hide merge call button" into mnc-dr-dev
Tyler Gunn [Thu, 20 Aug 2015 17:19:17 +0000 (17:19 +0000)]
Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

8 years agoam 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
David Friedman [Thu, 20 Aug 2015 16:59:08 +0000 (16:59 +0000)]
am 5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)

* commit '5389f46ce4245a6a0cfc931160ea13dab17f6590':
  Docs: Fixes to interactive-watch-face docs (CL 743190)

8 years agoMerge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev
Mitchell Wills [Thu, 20 Aug 2015 16:58:02 +0000 (16:58 +0000)]
Merge "Remove wifi enabled checking from settings TetherUtil" into mnc-dr-dev

8 years agoDocs: Fixes to interactive-watch-face docs (CL 743190)
David Friedman [Thu, 20 Aug 2015 15:31:07 +0000 (08:31 -0700)]
Docs: Fixes to interactive-watch-face docs (CL 743190)

Change-Id: I2b9c7d7afbf5583da01808027869e1e98873c7d1

8 years agoAdd missing removed permissions to the platform manifest
Svet Ganov [Thu, 20 Aug 2015 13:57:31 +0000 (06:57 -0700)]
Add missing removed permissions to the platform manifest

We need to keep in the manifest as normal hidden permissions
all removed dangerous ones to ensure backwards compatibility
as apps may be gating operations based on whether they have
a removed permission.

bug:23377184

Change-Id: I105bd646c4594d85c501f53a10ea393ee50046bc

8 years agoFix type-o in FingerprintManager documentation
Jim Miller [Thu, 20 Aug 2015 05:03:43 +0000 (22:03 -0700)]
Fix type-o in FingerprintManager documentation

Fixes bug 23274133

Change-Id: I15607d0e64c0b11d36d0e0d47ea88c42101e4dde

8 years agoMerge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev
Jorim Jaggi [Thu, 20 Aug 2015 02:18:36 +0000 (02:18 +0000)]
Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev

8 years agoMerge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
Jorim Jaggi [Thu, 20 Aug 2015 02:18:20 +0000 (02:18 +0000)]
Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev

* changes:
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint

8 years agoam c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1...
Dianne Hackborn [Thu, 20 Aug 2015 02:03:31 +0000 (02:03 +0000)]
am c14cbac4: Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

* commit 'c14cbac4a3e76d924621b34367cc8b6bcf977908':
  Fix issue #23361510: Increase assist timeout from 500ms to 1 second

8 years agoMerge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into...
Dianne Hackborn [Thu, 20 Aug 2015 01:56:02 +0000 (01:56 +0000)]
Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

8 years agoFix issue #23361510: Increase assist timeout from 500ms to 1 second
Dianne Hackborn [Thu, 20 Aug 2015 01:54:38 +0000 (18:54 -0700)]
Fix issue #23361510: Increase assist timeout from 500ms to 1 second

Actually, timeout is okay, but need to schedule it on UI thread.

Change-Id: I5b4ffa7caa33815a5223e3ddd08d4809bc7cf7b6

8 years agoSave interactive/screen-on state in KeyguardServiceDelegate
Jorim Jaggi [Wed, 19 Aug 2015 22:14:52 +0000 (15:14 -0700)]
Save interactive/screen-on state in KeyguardServiceDelegate

So when SystemUI/Keyguard crashes, we only call onStartedWakingUp and
onScreenTurnedOn when the device is interactive and/or the screen is
on.

Bug: 23344236
Change-Id: I0d0be91ff15d6c552304659956770ab88bb26ba4

8 years agoMIDI docs: fix buffer allocation
Phil Burk [Tue, 18 Aug 2015 23:43:22 +0000 (16:43 -0700)]
MIDI docs: fix buffer allocation

Also describe NoteOn more clearly.

Bug: 23303608
Change-Id: I35f88022c854c2eb16ec606e58f28e06c52d18b7
Signed-off-by: Phil Burk <philburk@google.com>
8 years agoam f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
Jeff Sharkey [Thu, 20 Aug 2015 01:33:59 +0000 (01:33 +0000)]
am f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

* commit 'f3ad1eabc1fa5252165bfe1516690d1026507f0a':
  Pass underlying volume UUID to StorageVolume.

8 years agoDon't animate in the navigation bar when going to full shade
Jorim Jaggi [Wed, 19 Aug 2015 03:27:54 +0000 (20:27 -0700)]
Don't animate in the navigation bar when going to full shade

Fixes some jank.

Bug: 22537253
Change-Id: Ia816fea6274e38cc2b18e2f28008b3a8341d37f7

8 years agoMerge "Pass underlying volume UUID to StorageVolume." into mnc-dev
Jeff Sharkey [Thu, 20 Aug 2015 01:28:30 +0000 (01:28 +0000)]
Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev

8 years agoam 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces...
David Friedman [Thu, 20 Aug 2015 01:24:02 +0000 (01:24 +0000)]
am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '6a21a5a142dad98c7bc678a9c9d0859d7558da4b':
  Docs: Creating interactive watch faces Bug: 21721463

8 years agoam 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463...
David Friedman [Thu, 20 Aug 2015 01:15:08 +0000 (01:15 +0000)]
am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '9f4ddca909e1f7d4274da3282a05494d6fb2f3f9':
  Docs: Creating interactive watch faces Bug: 21721463

8 years agoam 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over...
David Friedman [Thu, 20 Aug 2015 01:14:52 +0000 (01:14 +0000)]
am 6540375a: am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

* commit '6540375add2eafe9734ea6a54ebaa2c0587608e8':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836

8 years agoam 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructi...
David Friedman [Thu, 20 Aug 2015 01:06:29 +0000 (01:06 +0000)]
am 311f8eee: am ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836" into mnc-preview-docs

* commit '311f8eeee04937a08dd3576aaab74be19645c14e':
  Docs: Updating, clarifying Debug-over-WiFi instructions. Bug: 21371836

8 years agoam 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc...
David Friedman [Thu, 20 Aug 2015 00:57:50 +0000 (00:57 +0000)]
am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

* commit '56c22d29b8727e55073cede04b51e65eb6125b9f':
  Docs: Creating interactive watch faces Bug: 21721463

8 years agoMerge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs
David Friedman [Thu, 20 Aug 2015 00:44:58 +0000 (00:44 +0000)]
Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs

8 years agoadd placeholder for platform name in download button.
smain@google.com [Thu, 20 Aug 2015 00:35:23 +0000 (17:35 -0700)]
add placeholder for platform name in download button.
This change depends on the following change to the script that loads the platform name...
https://googleplex-android-review.git.corp.google.com/#/c/752776/

Change-Id: I7c9962f58d09d7a7f40dc6faa63014385b296498