OSDN Git Service

android-x86/frameworks-base.git
9 years agoUpdate metadata artwork and uri docs
RoboErik [Thu, 6 Nov 2014 18:55:06 +0000 (10:55 -0800)]
Update metadata artwork and uri docs

This updates the Javadoc on the bitmap and uri fields to strongly
suggest Uris be used for high res artwork and strongly suggest Uris
use the content: style and support EXTRA_SIZE.

Change-Id: If4c38bfec20d049473457784b1b56fa4d78abe5e

9 years agoskip MediaController callbacks if it's been unregistered
RoboErik [Tue, 4 Nov 2014 22:47:44 +0000 (14:47 -0800)]
skip MediaController callbacks if it's been unregistered

This gives slightly better gaurantees around when an app will receive
a callback. As long as they remove a callback on the same thread calls
get posted on they won't receive any callbacks after the remove.

bug:18104724
Change-Id: Id9878186f005bf0b35c0380cd35f8fd7e67d1d90

9 years agoam c3d174a0: am 848d9125: am 1afa82dc: docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:50:03 +0000 (20:50 +0000)]
am c3d174a0: am 848d9125: am 1afa82dc: docs:remove  sdk/ndk note

* commit 'c3d174a0304d3be57e485c48783d7c101553c78a':
  docs:remove  sdk/ndk note

9 years agoMerge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev
Sanket Padawe [Wed, 5 Nov 2014 20:30:28 +0000 (20:30 +0000)]
Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev

9 years agoam 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method...
Andrew Solovay [Wed, 5 Nov 2014 20:22:24 +0000 (20:22 +0000)]
am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
automerge: 8d7d7b4

* commit '8d7d7b448f2df7e4fdff6a3ca890b32b83075ead':
  docs: Removed broken link to non-existent method.

9 years agoam b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a runni...
Ricardo Cervera [Wed, 5 Nov 2014 20:21:03 +0000 (20:21 +0000)]
am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
automerge: b2f0f35

* commit 'b2f0f3514c20b478655e4c3f192a98cfea2335ce':
  docs: Add instructions to attach debugger to a running process.

9 years agoam 848d9125: am 1afa82dc: docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:17:55 +0000 (20:17 +0000)]
am 848d9125: am 1afa82dc: docs:remove  sdk/ndk note

* commit '848d912505079cc3cbd362a4333f0eabfac3c1c5':
  docs:remove  sdk/ndk note

9 years agoam 1afa82dc: docs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 20:13:35 +0000 (20:13 +0000)]
am 1afa82dc: docs:remove  sdk/ndk note

* commit '1afa82dce06ec03bcc2f58c4e144ba25c2ea1b2d':
  docs:remove  sdk/ndk note

9 years agoMerge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 19:17:20 +0000 (19:17 +0000)]
Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev

9 years agoMerge "Add error checking to aapt for split generation" into lmp-mr1-dev
Adam Lesinski [Wed, 5 Nov 2014 19:15:55 +0000 (19:15 +0000)]
Merge "Add error checking to aapt for split generation" into lmp-mr1-dev

9 years agoZen: Add the ability to enter "None" mode during downtime.
John Spurlock [Wed, 5 Nov 2014 14:13:30 +0000 (09:13 -0500)]
Zen: Add the ability to enter "None" mode during downtime.

Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d

9 years agoMerge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
Craig Mautner [Wed, 5 Nov 2014 19:07:59 +0000 (19:07 +0000)]
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev

9 years agoMerge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()"...
Paul Jensen [Wed, 5 Nov 2014 19:05:07 +0000 (19:05 +0000)]
Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" into lmp-mr1-dev

9 years agoMerge "Materialize default app icon." into lmp-mr1-dev
Dan Sandler [Wed, 5 Nov 2014 18:58:12 +0000 (18:58 +0000)]
Merge "Materialize default app icon." into lmp-mr1-dev

9 years agoam df37d45f: Merge "docs: Add instructions to attach debugger to a running process...
Ricardo Cervera [Wed, 5 Nov 2014 18:54:12 +0000 (18:54 +0000)]
am df37d45f: Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev automerge: 25a4e21

* commit 'df37d45f1311dcbfbcc58b3ff81f3df56c46fcdd':
  docs: Add instructions to attach debugger to a running process.

9 years agoam 5a818e55: Merge "Add config to control going to sleep when entering theater mode...
Bryce Lee [Wed, 5 Nov 2014 18:54:06 +0000 (18:54 +0000)]
am 5a818e55: Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev

* commit '5a818e55a7faee421567eb037ac4e42f20bca0c4':
  Add config to control going to sleep when entering theater mode.

9 years agoMerge "More flexible intent extra parsing." into lmp-mr1-dev
Daniel Sandler [Wed, 5 Nov 2014 18:53:42 +0000 (18:53 +0000)]
Merge "More flexible intent extra parsing." into lmp-mr1-dev

9 years agoam 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method...
Andrew Solovay [Wed, 5 Nov 2014 18:52:27 +0000 (18:52 +0000)]
am 56576838: am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs

* commit '56576838a8e8c4f44f8df13cc40295a918540b86':
  docs: Removed broken link to non-existent method.

9 years agoam b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a runni...
Ricardo Cervera [Wed, 5 Nov 2014 18:52:23 +0000 (18:52 +0000)]
am b4125d1e: am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs

* commit 'b4125d1e0bbf1ce90d0bfb03e5e068180bbb6b20':
  docs: Add instructions to attach debugger to a running process.

9 years agoam d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
Andrew Solovay [Wed, 5 Nov 2014 18:47:17 +0000 (18:47 +0000)]
am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs

* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
  docs: Removed broken link to non-existent method.

9 years agoWhen keyguard exits use same anim for all windows
Craig Mautner [Tue, 4 Nov 2014 23:32:57 +0000 (15:32 -0800)]
When keyguard exits use same anim for all windows

The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.

Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.

This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.

(Also refactorings to eliminate redundant code and unnecessary
variables.)

Fixes bug 15991916.

Change-Id: I844d102439b6eda8c912108431916e04b12f7298

9 years agoam 58f1200c: Merge "docs: Add instructions to attach debugger to a running process...
Ricardo Cervera [Wed, 5 Nov 2014 18:47:13 +0000 (18:47 +0000)]
am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs

* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
  docs: Add instructions to attach debugger to a running process.

9 years agodocs:remove sdk/ndk note
Rich Slogar [Wed, 5 Nov 2014 18:14:56 +0000 (10:14 -0800)]
docs:remove  sdk/ndk note

Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b

9 years agoMerge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev
RoboErik [Wed, 5 Nov 2014 18:29:31 +0000 (18:29 +0000)]
Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev

9 years agoMerge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
RoboErik [Wed, 5 Nov 2014 18:25:59 +0000 (18:25 +0000)]
Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev

* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession

9 years agoMerge "docs: Removed broken link to non-existent method." into lmp-docs
Andrew Solovay [Wed, 5 Nov 2014 18:14:04 +0000 (18:14 +0000)]
Merge "docs: Removed broken link to non-existent method." into lmp-docs

9 years agoMerge "Update network selections on capability change." into lmp-mr1-dev
Jeff Davidson [Wed, 5 Nov 2014 17:41:35 +0000 (17:41 +0000)]
Merge "Update network selections on capability change." into lmp-mr1-dev

9 years agoMerge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
Filip Gruszczynski [Wed, 5 Nov 2014 17:39:33 +0000 (17:39 +0000)]
Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev

9 years agoMerge "docs: Add instructions to attach debugger to a running process." into lmp-dev
Ricardo Cervera [Wed, 5 Nov 2014 17:08:37 +0000 (17:08 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
automerge: 25a4e21

* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
  docs: Add instructions to attach debugger to a running process.

9 years agoMerge "Support disconnecting conference participants from conference." into lmp-mr1-dev
Tyler Gunn [Wed, 5 Nov 2014 17:03:11 +0000 (17:03 +0000)]
Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev

9 years agoMaterialize default app icon.
Dan Sandler [Wed, 5 Nov 2014 17:02:22 +0000 (12:02 -0500)]
Materialize default app icon.

Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4

9 years agoMerge "docs: Add instructions to attach debugger to a running process." into lmp...
Ricardo Cervera [Wed, 5 Nov 2014 17:00:09 +0000 (17:00 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs

9 years agoMerge "docs: Add instructions to attach debugger to a running process." into lmp-dev
Ricardo Cervera [Wed, 5 Nov 2014 16:58:22 +0000 (16:58 +0000)]
Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev

9 years agoMerge "Add config to control going to sleep when entering theater mode." into lmp...
Bryce Lee [Wed, 5 Nov 2014 16:41:39 +0000 (16:41 +0000)]
Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev

9 years agoMerge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
Jorim Jaggi [Wed, 5 Nov 2014 16:17:30 +0000 (16:17 +0000)]
Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev

9 years agoMerge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp...
Andres Morales [Wed, 5 Nov 2014 16:01:23 +0000 (16:01 +0000)]
Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev

9 years agoMerge "Fix javadoc." into lmp-mr1-dev
George Mount [Wed, 5 Nov 2014 15:22:42 +0000 (15:22 +0000)]
Merge "Fix javadoc." into lmp-mr1-dev

9 years agoMerge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 14:47:19 +0000 (14:47 +0000)]
Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev

9 years agoMerge "QS: Toggle tile icon animations." into lmp-mr1-dev
John Spurlock [Wed, 5 Nov 2014 14:47:02 +0000 (14:47 +0000)]
Merge "QS: Toggle tile icon animations." into lmp-mr1-dev

9 years agoFix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
Paul Jensen [Wed, 5 Nov 2014 14:35:26 +0000 (09:35 -0500)]
Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()

setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853

9 years agoQS: Toggle tile icon animations.
John Spurlock [Wed, 5 Nov 2014 00:36:44 +0000 (19:36 -0500)]
QS: Toggle tile icon animations.

 - New location tile icon animation.
 - New flashlight tile icon animation.
 - New airplane-mode tile icon animation.
 - New color inversion tile icon animation.
 - Remove obsolete static icons.

Bug: 17426910
Change-Id: I51c98979afd46f4cdfc2fd383e80d7bf13c5eeab

9 years agoFix janky in transition doze -> lockscreen
Jorim Jaggi [Wed, 5 Nov 2014 14:06:58 +0000 (15:06 +0100)]
Fix janky in transition doze -> lockscreen

Also fix some unnecessary layer creation for dismiss button.

Bug: 18238168
Change-Id: I71989f2a24162e4453781c07e50d6c25fb380089

9 years agoZen: Create a new exit condition for "next alarm".
John Spurlock [Mon, 3 Nov 2014 16:01:51 +0000 (11:01 -0500)]
Zen: Create a new exit condition for "next alarm".

- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148

9 years agoMerge "Add recorder address to all recording listerner apis." into lmp-mr1-dev
Jungshik Jang [Wed, 5 Nov 2014 05:54:13 +0000 (05:54 +0000)]
Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev

9 years agoMerge "Use default token instead of wrapped window manager" into lmp-mr1-dev
Alan Viverette [Wed, 5 Nov 2014 04:44:22 +0000 (04:44 +0000)]
Merge "Use default token instead of wrapped window manager" into lmp-mr1-dev

9 years agoam 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am...
Tom Taylor [Wed, 5 Nov 2014 04:36:34 +0000 (04:36 +0000)]
am 865a6582: am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection i

* commit '865a6582462a132c3d579b0cae0792062d76833e':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported...
Tom Taylor [Wed, 5 Nov 2014 04:36:20 +0000 (04:36 +0000)]
am dd41b629: am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'dd41b6292433915b5b470c61476afca11df043e3':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoRevert "When keyguard exits use same anim for all windows"
Alan Viverette [Wed, 5 Nov 2014 04:34:41 +0000 (20:34 -0800)]
Revert "When keyguard exits use same anim for all windows"

Broke window animations.

This reverts commit b83408018176ec58f50e792590a22fdc9eb87fff.

BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86

9 years agoAdd recorder address to all recording listerner apis.
Jungshik Jang [Wed, 5 Nov 2014 03:50:35 +0000 (12:50 +0900)]
Add recorder address to all recording listerner apis.

It enables to recognize which recorder reports record status.

Bug: 18248734
Change-Id: I248ad77212ce584dc16863cbe00639e7ac3c184a

9 years agoam 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am...
Tom Taylor [Wed, 5 Nov 2014 04:26:13 +0000 (04:26 +0000)]
am 4e985118: am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushMana

* commit '4e9851183daf26d602d641917378d55a9516f128':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate...
Tom Taylor [Wed, 5 Nov 2014 04:26:09 +0000 (04:26 +0000)]
am f2f59e7a: am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'f2f59e7ab916e37d510db151904c95c42006ae08':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am...
Tom Taylor [Wed, 5 Nov 2014 04:21:07 +0000 (04:21 +0000)]
am 6209d4e4: am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue...
Tom Taylor [Wed, 5 Nov 2014 04:20:11 +0000 (04:20 +0000)]
am db864e4d: am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoAutomatic brightness using ALS while dozing.
Filip Gruszczynski [Tue, 28 Oct 2014 21:12:40 +0000 (14:12 -0700)]
Automatic brightness using ALS while dozing.

Bug: 16525667

Change-Id: Ib75cfebf46f2c122e7b68556591b601d22a318e1

9 years agoMerge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev
Alan Viverette [Wed, 5 Nov 2014 02:09:29 +0000 (02:09 +0000)]
Merge "Fix hasSurfaceInsets check when creating hardware renderer" into lmp-mr1-dev

9 years agoChanges related to setting default color for sim in multisim.
Sanket Padawe [Wed, 5 Nov 2014 01:57:13 +0000 (17:57 -0800)]
Changes related to setting default color for sim in multisim.

Changes for setting default sim color when the subinforecord
is added into the database.

Change-Id: I5717da94bfb6bb260864a46c3898d347be96d6af

9 years agoMerge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev
Andres Morales [Wed, 5 Nov 2014 01:48:21 +0000 (01:48 +0000)]
Merge "Increase min free levels for cached processes on 64bit" into lmp-mr1-dev

9 years agoMerge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev
Alan Viverette [Wed, 5 Nov 2014 01:41:26 +0000 (01:41 +0000)]
Merge "Abort accessibility node prefetch if parent node is null" into lmp-mr1-dev

9 years agoUse default token instead of wrapped window manager
Alan Viverette [Wed, 5 Nov 2014 01:40:29 +0000 (17:40 -0800)]
Use default token instead of wrapped window manager

BUG: 18248602
Change-Id: Id7f06c896dc71db3564fa21d3704222557613035

9 years agoIncrease min free levels for cached processes on 64bit
Andres Morales [Tue, 4 Nov 2014 22:56:16 +0000 (14:56 -0800)]
Increase min free levels for cached processes on 64bit

Requires less memory pressure to start killing cached
processes.

Bug: 18241791
Change-Id: Ia02f5aee115535badc900330b9361f0099203e4f

9 years agoMerge "When keyguard exits use same anim for all windows" into lmp-mr1-dev
Craig Mautner [Wed, 5 Nov 2014 01:23:03 +0000 (01:23 +0000)]
Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev

9 years agoMerge "Use CharSequence for DisplayName" into lmp-mr1-dev
Stuart Scott [Wed, 5 Nov 2014 01:19:11 +0000 (01:19 +0000)]
Merge "Use CharSequence for DisplayName" into lmp-mr1-dev

9 years agoMerge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into...
Wale Ogunwale [Wed, 5 Nov 2014 01:14:21 +0000 (01:14 +0000)]
Merge "Fix issue #18240452: No recents screenshot when resuming from keyguard." into lmp-mr1-dev

9 years agoFix hasSurfaceInsets check when creating hardware renderer
Alan Viverette [Wed, 5 Nov 2014 01:04:02 +0000 (17:04 -0800)]
Fix hasSurfaceInsets check when creating hardware renderer

BUG: 17729606
Change-Id: I8c7092428b790e0ff3bbf84b64ba385ef2b2f521

9 years agoUpdate network selections on capability change.
Jeff Davidson [Wed, 5 Nov 2014 00:48:27 +0000 (16:48 -0800)]
Update network selections on capability change.

Among other reasons, this is needed when a Wi-Fi connection is
upgraded from untrusted to trusted, so that the default route can be
updated to point to the Wi-Fi network instead.

Bug: 18206275
Change-Id: I53f7a6f00f66a23ae4873fa2334cd8a621f39d4f

9 years agoMerge "Default gradient radius to %p when no intrinsic width or height set" into...
Alan Viverette [Wed, 5 Nov 2014 00:43:15 +0000 (00:43 +0000)]
Merge "Default gradient radius to %p when no intrinsic width or height set" into lmp-mr1-dev

9 years agoam 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older...
Eric Gilmore [Wed, 5 Nov 2014 00:26:49 +0000 (00:26 +0000)]
am 1c9860f9: am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

* commit '1c9860f9285709cddff2e570a50e3afc66091135':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

9 years agoam 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd...
Eric Gilmore [Wed, 5 Nov 2014 00:20:18 +0000 (00:20 +0000)]
am 4f82acd8: am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

* commit '4f82acd810601c4d055906cb2b671cafd15d3fc8':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

9 years agoam bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includ...
Eric Gilmore [Wed, 5 Nov 2014 00:12:16 +0000 (00:12 +0000)]
am bf78adb2: Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

* commit 'bf78adb25e80b9107fcd682d30e7157093681547':
  Adding 5.0 emulator image and removing older image. 2nd patch set includes low/high res. images.

9 years agoFix issue #18240452: No recents screenshot when resuming from keyguard.
Wale Ogunwale [Wed, 5 Nov 2014 00:09:19 +0000 (16:09 -0800)]
Fix issue #18240452: No recents screenshot when resuming from keyguard.

WindowManager.keyguardGoingAway() isn't called early enough when you exit
the keyguard by clicking on a notification. So, the WindowState for the
preivous activity behind the keyguard is never transitioned to visible
and the activity manager then fails to take the screenshot for recents.
We will now be taking a screenshot of the activity before we go to sleep
so we are not dependent on signals from the keyguard.

Change-Id: I2acb2ad7a627d4e446ba11c9a0842d21fa6922d3

9 years agoMerge "Always update date picker position after change in range" into lmp-mr1-dev
Alan Viverette [Wed, 5 Nov 2014 00:00:51 +0000 (00:00 +0000)]
Merge "Always update date picker position after change in range" into lmp-mr1-dev

9 years agoAbort accessibility node prefetch if parent node is null
Alan Viverette [Tue, 4 Nov 2014 23:59:55 +0000 (15:59 -0800)]
Abort accessibility node prefetch if parent node is null

BUG: 18004444
Change-Id: I80757daeb6b381947c4f3abbd762711cff2a978c

9 years agoWhen keyguard exits use same anim for all windows
Craig Mautner [Tue, 4 Nov 2014 23:32:57 +0000 (15:32 -0800)]
When keyguard exits use same anim for all windows

The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.

Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.

This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.

(Also refactorings to eliminate redundant code and unnecessary
variables.)

Fixes bug 15991916.

Change-Id: I9949ef0a1639c831754316da34de97cb86403f5a

9 years agoAdding 5.0 emulator image and removing older image.
Eric Gilmore [Tue, 28 Oct 2014 20:33:30 +0000 (13:33 -0700)]
Adding 5.0 emulator image and removing older image.
2nd patch set includes low/high res. images.

Bug: 18026943

Change-Id: I102e5de616251e742c8e7b9cf1948be1cbbc4a1c

9 years agoSupport disconnecting conference participants from conference.
Tyler Gunn [Tue, 4 Nov 2014 22:53:37 +0000 (14:53 -0800)]
Support disconnecting conference participants from conference.

- Added "onDisconnectConferenceParticipant" method used to inform a
connection acting as the conference host that one of the participants
should be disconnected.
- Added "VIRTUAL_CALL" PhoneCapability used to indicate that a call cannot
be the active or background call, but only be a child of another call.

Bug: 18228141
Bug: 18176606
Change-Id: I7aec631cc89c0f08e174b24ce3a9cb547b47e36b

9 years agoUse CharSequence for DisplayName
Stuart Scott [Tue, 4 Nov 2014 22:39:57 +0000 (14:39 -0800)]
Use CharSequence for DisplayName

Change-Id: Ibb93424b85b11913282a4980e756b66a8d7946d5

9 years agoMerge "Fix bug where checking-in more than once would cause an infinite loop in Usage...
Adam Lesinski [Tue, 4 Nov 2014 22:32:30 +0000 (22:32 +0000)]
Merge "Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService" into lmp-mr1-dev

9 years agoMerge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev
Sreeram Ramachandran [Tue, 4 Nov 2014 21:59:22 +0000 (21:59 +0000)]
Merge "Don't use framework permission strings for netd permissions." into lmp-mr1-dev

9 years agoAdd extras to the PlaybackState
RoboErik [Tue, 4 Nov 2014 21:47:45 +0000 (13:47 -0800)]
Add extras to the PlaybackState

This allows apps to include extras that are atomic with play state
changes.

bug:18189125
bug:18103891
Change-Id: Ia3bc5b0dcf29960cb70e2ff3a67ec1fdd48b7a5a

9 years agoFix bug where checking-in more than once would cause an infinite loop in UsageStatsSe...
Adam Lesinski [Tue, 4 Nov 2014 21:38:46 +0000 (13:38 -0800)]
Fix bug where checking-in more than once would cause an infinite loop in UsageStatsService

- Forgot to increment loop variable :S

Bug:18239732
Change-Id: Ie37a83584d7849108dbfd3bd4cbb595520d488b1

9 years agoAdd setRatingType to MediaSession
RoboErik [Tue, 4 Nov 2014 21:00:22 +0000 (13:00 -0800)]
Add setRatingType to MediaSession

This was missing in L. Needed to tell controllers how to rate content.

bug:18051829
Change-Id: I26e662ff04f77ed7f2922bf9e74acf74c850547b

9 years agoAdd config to control going to sleep when entering theater mode.
Bryce Lee [Tue, 4 Nov 2014 20:43:44 +0000 (12:43 -0800)]
Add config to control going to sleep when entering theater mode.

Bug: 18241209
Change-Id: I7fa29d92391b1c8ab74585008d6599fd7174cc61

9 years agoMerge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev
Alan Viverette [Tue, 4 Nov 2014 19:30:33 +0000 (19:30 +0000)]
Merge "Pass surface insets from window attributes rather than params" into lmp-mr1-dev

9 years agoPass surface insets from window attributes rather than params
Alan Viverette [Tue, 4 Nov 2014 19:27:19 +0000 (11:27 -0800)]
Pass surface insets from window attributes rather than params

Params only gets set in certain situations, whereas the actual window
attributes always contain the correct surface insets.

BUG: 18214798
Change-Id: Ib5236ccf3f120b26c5abc8671bf29cb3dc269186

9 years agoam 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am...
Tom Taylor [Tue, 4 Nov 2014 19:18:50 +0000 (19:18 +0000)]
am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name...
Scott Kennedy [Tue, 4 Nov 2014 19:16:55 +0000 (19:16 +0000)]
am 4b28b1c3: am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs

* commit '4b28b1c3f579e285b9b030ea1612bf7cb0ef04e1':
  Fix a small typo in a variable name

9 years agoam c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example...
Ricardo Cervera [Tue, 4 Nov 2014 19:16:48 +0000 (19:16 +0000)]
am c190e7ee: am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs

* commit 'c190e7ee015202b6bc2be08a3c874efaf42b779f':
  docs: Fix the circularReveal example.

9 years agoam 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am...
Tom Taylor [Tue, 4 Nov 2014 19:14:26 +0000 (19:14 +0000)]
am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '47419a443591ea3c641da8720514e1384dd75440':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am...
Tom Taylor [Tue, 4 Nov 2014 19:08:16 +0000 (19:08 +0000)]
am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '192a39044290be84a1086a876a9d4ab0571ab97b':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am...
Tom Taylor [Tue, 4 Nov 2014 19:00:42 +0000 (19:00 +0000)]
am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '23fb29723c47b2aeb6aecc382a503630a8d8e983':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoFix issue #17305377: Don't kill process if it still has tasks.
Wale Ogunwale [Thu, 23 Oct 2014 22:55:23 +0000 (15:55 -0700)]
Fix issue #17305377: Don't kill process if it still has tasks.

We previously killed a process when one of its task was
swiped away in the recents UI. This had negative performance
implications for apps with multiple tasks in recents. Now we
will only kill the process if there are no more tasks associated
with it.

Changed also removes the need for the
ActivityManager.REMOVE_TASK_KILL_PROCESS since ActivityManager
will now only kill a task process if it process has no out
standing tasks.

Bug: 17305377
Change-Id: Ibc39bb328d13c7eab05c04798c2f14887923d9d4

9 years agoam d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am...
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'd7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am...
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit 'b2e54c1b46c275d017fb5bef17add3eb4c465508':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am...
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '75e7fbaa83448753a1db9647e58693f1a281900c':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externa...
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '37906e6ebc1985ad4b7151116b7cf4fef8322b19':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported...
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '44f6d0d5810ce507394cc514481d977315d2496f':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoDon't use framework permission strings for netd permissions.
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
Don't use framework permission strings for netd permissions.

These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.

Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517

9 years agoam cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs
Scott Kennedy [Tue, 4 Nov 2014 18:12:05 +0000 (18:12 +0000)]
am cf57296d: am d78ce503: Merge "Fix a small typo in a variable name" into lmp-docs

* commit 'cf57296da6a22bff03eefda7b704787769ad4d37':
  Fix a small typo in a variable name

9 years agoam 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate...
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

* commit '4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager

9 years agoam af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp...
Ricardo Cervera [Tue, 4 Nov 2014 18:07:11 +0000 (18:07 +0000)]
am af002b35: am 61f91724: Merge "docs: Fix the circularReveal example." into lmp-docs

* commit 'af002b352ade0d7f9eeff15221f487c3912ebb34':
  docs: Fix the circularReveal example.