OSDN Git Service

android-x86/frameworks-base.git
11 years agoam 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 20 May 2013 15:22:43 +0000 (08:22 -0700)]
am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0':
  Fix issue #9000597: PackageManager get NPE while running performance plan

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 20 May 2013 15:20:20 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 20 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
Robert Greenwalt [Sun, 19 May 2013 19:51:47 +0000 (12:51 -0700)]
am c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev

* commit 'c3de50cd3cff76082bc01b04a8a6bbde300d725e':
  Add some temp wifi debugging output

11 years agoam 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
Robert Greenwalt [Sun, 19 May 2013 19:49:44 +0000 (12:49 -0700)]
am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev

* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
  Add some temp wifi debugging output

11 years agoMerge "Add some temp wifi debugging output" into jb-mr2-dev
Robert Greenwalt [Sun, 19 May 2013 19:46:58 +0000 (19:46 +0000)]
Merge "Add some temp wifi debugging output" into jb-mr2-dev

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 19 May 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at runtim...
John Spurlock [Sun, 19 May 2013 08:25:34 +0000 (01:25 -0700)]
am c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev

* commit 'c6ab8a614767cae1fc9df5984414c9f15ea7b588':
  Deactivate notification listeners disabled at runtime.

11 years agoam d0154550: Merge "Deactivate notification listeners disabled at runtime." into...
John Spurlock [Sun, 19 May 2013 08:23:30 +0000 (01:23 -0700)]
am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev

* commit 'd0154550e0d5e8dea5b65849747266f5fa0d2d5d':
  Deactivate notification listeners disabled at runtime.

11 years agoMerge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev
John Spurlock [Sun, 19 May 2013 08:03:47 +0000 (08:03 +0000)]
Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev

11 years agoAdd some temp wifi debugging output
Robert Greenwalt [Sat, 18 May 2013 18:24:22 +0000 (11:24 -0700)]
Add some temp wifi debugging output

bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9

11 years agoDeactivate notification listeners disabled at runtime.
John Spurlock [Thu, 16 May 2013 13:10:05 +0000 (09:10 -0400)]
Deactivate notification listeners disabled at runtime.

PACKAGE_CHANGED is called when either the application or any
of its components change.  Rework old early exit code to
handle component-level disabling wrt listeners.

Note PACKAGE_CHANGED can take quite a while to reach NMS.
Up to ten seconds (!) after component-disabling in app.

Bug:8982243
Change-Id: Ia325516140dd9288466a663192a5326019f071ab

11 years agoam 6ffce75f: am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into...
Brett Chabot [Sat, 18 May 2013 00:19:02 +0000 (17:19 -0700)]
am 6ffce75f: am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev

* commit '6ffce75fa78fba82bde8f1df5828d177457b7a7a':
  Fix PhoneWindowManager#getUserRotationMode

11 years agoam 8e3f01e9: am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into...
Santos Cordon [Sat, 18 May 2013 00:19:00 +0000 (17:19 -0700)]
am 8e3f01e9: am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev

* commit '8e3f01e90ed51b055e0addb7d5114b732bd514b9':
  Update documentation of NEW_OUTGOING_CALL

11 years agoam 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev
Brett Chabot [Sat, 18 May 2013 00:16:47 +0000 (17:16 -0700)]
am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev

* commit '154bb5597cbd3985e3ab86647c5feaa2e289e1a9':
  Fix PhoneWindowManager#getUserRotationMode

11 years agoam c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
Santos Cordon [Sat, 18 May 2013 00:16:45 +0000 (17:16 -0700)]
am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev

* commit 'c1de240457ad803c04c56fb3f63635966b862b43':
  Update documentation of NEW_OUTGOING_CALL

11 years agoMerge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev
Brett Chabot [Sat, 18 May 2013 00:15:25 +0000 (00:15 +0000)]
Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev

11 years agoMerge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
Santos Cordon [Sat, 18 May 2013 00:14:13 +0000 (00:14 +0000)]
Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev

11 years agoMerge "Clear display lists when a View becomes GONE/INVISIBLE"
Romain Guy [Sat, 18 May 2013 00:11:50 +0000 (00:11 +0000)]
Merge "Clear display lists when a View becomes GONE/INVISIBLE"

11 years agoClear display lists when a View becomes GONE/INVISIBLE
Romain Guy [Sat, 18 May 2013 00:07:47 +0000 (17:07 -0700)]
Clear display lists when a View becomes GONE/INVISIBLE

We force an invalidate whenever a View becomes VISIBLE so there is
no need to keep the display list object while the view is either
GONE or INVISIBLE. In particular this clears the lists of references
kept by GLES20DisplayList, which helps the GC free large objects
such as Bitmaps.

Change-Id: Ifde0cb40baa1f35e5e6439d3bf8eab3c4c1270f0

11 years agoUpdate documentation of NEW_OUTGOING_CALL
Santos Cordon [Fri, 17 May 2013 21:48:54 +0000 (14:48 -0700)]
Update documentation of NEW_OUTGOING_CALL

Adds call-handling as a use case for NEW_OUTGOING_CALL

bug: 8987211
Change-Id: Icd9c53a2dd1a5948a749e133600db21c2560fd1f

11 years agoam 5baf581d: am 743054f5: Merge "disable notification listeners on uninstall" into...
Chris Wren [Fri, 17 May 2013 22:10:22 +0000 (15:10 -0700)]
am 5baf581d: am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev

* commit '5baf581d58a86a0f9ea9689a1418b925ac49021e':
  disable notification listeners on uninstall

11 years agoam 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev
Chris Wren [Fri, 17 May 2013 22:08:19 +0000 (15:08 -0700)]
am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev

* commit '743054f5b3ad088b00adac44bb6d1f542d4375db':
  disable notification listeners on uninstall

11 years agoMerge "disable notification listeners on uninstall" into jb-mr2-dev
Chris Wren [Fri, 17 May 2013 22:06:13 +0000 (22:06 +0000)]
Merge "disable notification listeners on uninstall" into jb-mr2-dev

11 years agoam 1aa4bec5: am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices
Michael Wright [Fri, 17 May 2013 21:59:25 +0000 (14:59 -0700)]
am 1aa4bec5: am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices

* commit '1aa4bec5e41628dc6086436331a37b5174a001df':
  Remove assist swipe from TOUCH_NAVIGATION devices

11 years agoam 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices
Michael Wright [Fri, 17 May 2013 21:57:25 +0000 (14:57 -0700)]
am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices

* commit '4361e1f46ef9e30c78679b5e2717b74d66191692':
  Remove assist swipe from TOUCH_NAVIGATION devices

11 years agoRemove assist swipe from TOUCH_NAVIGATION devices
Michael Wright [Fri, 17 May 2013 21:25:52 +0000 (14:25 -0700)]
Remove assist swipe from TOUCH_NAVIGATION devices

Bug: 9019927
Change-Id: I0a67ee00038b6fba7818f64ba02515767e34fe06
(cherry picked from commit 681a3d710402b80a8375a05172b1fb6f720295be)

11 years agoam 25f6f4f5: am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA...
Romain Guy [Fri, 17 May 2013 21:14:32 +0000 (14:14 -0700)]
am 25f6f4f5: am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

* commit '25f6f4f5d082828fe0eb4f24be2bfaa15b71242e':
  Update Canvas.getClipBounds to not account for AA clips.

11 years agoam 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into...
Romain Guy [Fri, 17 May 2013 21:12:43 +0000 (14:12 -0700)]
am 3c1ad55f: Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

* commit '3c1ad55fcfa54c2c30073d07917da699d156dc58':
  Update Canvas.getClipBounds to not account for AA clips.

11 years agoMerge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev
Romain Guy [Fri, 17 May 2013 21:10:21 +0000 (21:10 +0000)]
Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev

11 years agoFix issue #9000597: PackageManager get NPE while running performance plan
Dianne Hackborn [Fri, 17 May 2013 19:07:21 +0000 (12:07 -0700)]
Fix issue #9000597: PackageManager get NPE while running performance plan

Change-Id: I2bf777e8b15704d21320f95059d94648122396a8

11 years agoam 46449b8b: am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while...
Dianne Hackborn [Fri, 17 May 2013 20:36:21 +0000 (13:36 -0700)]
am 46449b8b: am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

* commit '46449b8bbca2b937771d284c081012ff4696cbe2':
  Fix issue #9000597: PackageManager get NPE while running performance plan

11 years agoam d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performa...
Dianne Hackborn [Fri, 17 May 2013 20:34:30 +0000 (13:34 -0700)]
am d31db759: Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

* commit 'd31db759cba78447ba1f4286a84c27a30a5aeb5c':
  Fix issue #9000597: PackageManager get NPE while running performance plan

11 years agoMerge "Fix issue #9000597: PackageManager get NPE while running performance plan...
Dianne Hackborn [Fri, 17 May 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Fix issue #9000597: PackageManager get NPE while running performance plan" into jb-mr2-dev

11 years agodisable notification listeners on uninstall
Chris Wren [Wed, 15 May 2013 18:50:28 +0000 (14:50 -0400)]
disable notification listeners on uninstall

Bug: 8979640
Change-Id: I9f1d118e5ce210b829476e0971f3d55fc778c227

11 years agoam b4667497: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 17 May 2013 19:59:37 +0000 (12:59 -0700)]
am b4667497: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'b46674978765e29d838eb7e5d4810d047037f855':
  Add min delay between disable and enable of wifi

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Fri, 17 May 2013 19:54:33 +0000 (12:54 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa

11 years agoam b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev
Jeff Brown [Fri, 17 May 2013 19:46:08 +0000 (12:46 -0700)]
am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev

* commit 'b7871af2fbde70c7cf4812d5710b2729588bac54':
  Add route description API.

11 years agoam 50ab525a: Merge "Add route description API." into jb-mr2-dev
Jeff Brown [Fri, 17 May 2013 19:44:37 +0000 (12:44 -0700)]
am 50ab525a: Merge "Add route description API." into jb-mr2-dev

* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.

11 years agoMerge "Add route description API." into jb-mr2-dev
Jeff Brown [Fri, 17 May 2013 19:41:10 +0000 (19:41 +0000)]
Merge "Add route description API." into jb-mr2-dev

11 years agoam d29accc6: (-s ours) am 9cd4e67e: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 19:12:00 +0000 (12:12 -0700)]
am d29accc6: (-s ours) am 9cd4e67e: Import translations. DO NOT MERGE

* commit 'd29accc6990884ba054a1a22867a3acae4bee18b':
  Import translations. DO NOT MERGE

11 years agoam 9cd4e67e: Import translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 19:09:28 +0000 (12:09 -0700)]
am 9cd4e67e: Import translations. DO NOT MERGE

* commit '9cd4e67e10f86710734db5e2e8659e1346f3c041':
  Import translations. DO NOT MERGE

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 17 May 2013 19:09:28 +0000 (19:09 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 17 May 2013 19:07:56 +0000 (19:07 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoFix issue #9000597: PackageManager get NPE while running performance plan
Dianne Hackborn [Fri, 17 May 2013 19:07:21 +0000 (12:07 -0700)]
Fix issue #9000597: PackageManager get NPE while running performance plan

Change-Id: I2bf777e8b15704d21320f95059d94648122396a8

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 17:32:11 +0000 (10:32 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 17:23:58 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE

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

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 17 May 2013 17:13:15 +0000 (10:13 -0700)]
Import translations. DO NOT MERGE

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

11 years agoMerge "Add tessellation path for points"
Chris Craik [Fri, 17 May 2013 17:02:30 +0000 (17:02 +0000)]
Merge "Add tessellation path for points"

11 years agoam d2f5f21a: am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windo...
Scott Main [Fri, 17 May 2013 03:50:43 +0000 (20:50 -0700)]
am d2f5f21a: am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'd2f5f21aeadf52f4c9102e21541254b6ea2075fc':
  add info about Windows issue and link to issues page

11 years agoam ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue...
Scott Main [Fri, 17 May 2013 03:45:47 +0000 (20:45 -0700)]
am ecd3f2d7: am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'ecd3f2d729188a869c3dfa771ba050e4caaf0dbb':
  add info about Windows issue and link to issues page

11 years agoFix PhoneWindowManager#getUserRotationMode
Brett Chabot [Fri, 17 May 2013 02:38:08 +0000 (19:38 -0700)]
Fix PhoneWindowManager#getUserRotationMode

This method should be reading from the ACCELEROMETER_ROTATION instead
of the USER_ROTATION setting.

Needed for uiautomator to properly restore the current auto rotation
setting after test run finishes.

Bug 8985351

Change-Id: I50f100117c0590dd65a646b584d027751ad5d3ce

11 years agoam eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issue...
Scott Main [Fri, 17 May 2013 01:07:22 +0000 (18:07 -0700)]
am eec9bc2f: am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'eec9bc2f567f037225e9bea1d0facebeb98a183d':
  add info about Windows issue and link to issues page

11 years agoam ec5c93e0: am df82d256: add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 01:05:13 +0000 (18:05 -0700)]
am ec5c93e0: am df82d256: add info about Windows issue and link to issues page

* commit 'ec5c93e0ecd92223a20c049b03f183c588391592':
  add info about Windows issue and link to issues page

11 years agoam df82d256: add info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 01:03:12 +0000 (18:03 -0700)]
am df82d256: add info about Windows issue and link to issues page

* commit 'df82d256592d6743e400ccf1c82822ddb56fefbe':
  add info about Windows issue and link to issues page

11 years agoadd info about Windows issue and link to issues page
Scott Main [Fri, 17 May 2013 00:58:11 +0000 (17:58 -0700)]
add info about Windows issue and link to issues page

Change-Id: I07f1962fd00fc87c783e090f3e6986449f7b6f7c

11 years agoAdd min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 19:48:20 +0000 (12:48 -0700)]
Add min delay between disable and enable of wifi

We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1

11 years agoam 55e150a5: am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:17:17 +0000 (15:17 -0700)]
am 55e150a5: am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit '55e150a5138760c697ac850e7c203ad477d56dcd':
  add nav drawer icon zip

11 years agoam 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:14:09 +0000 (15:14 -0700)]
am 03fe26d5: am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit '03fe26d5b151bc9ad1c6913edb618e666b1c9b89':
  add nav drawer icon zip

11 years agoam d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:12:11 +0000 (15:12 -0700)]
am d7088026: am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit 'd708802698baea82136c12e8a4cee805ab0b3efb':
  add nav drawer icon zip

11 years agoam 26ab3060: am c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:09:40 +0000 (15:09 -0700)]
am 26ab3060: am c452f1e2: add nav drawer icon zip

* commit '26ab3060ad402204c8a50e184c3947a897667642':
  add nav drawer icon zip

11 years agoam c452f1e2: add nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:07:46 +0000 (15:07 -0700)]
am c452f1e2: add nav drawer icon zip

* commit 'c452f1e251ca7aa26a2cfbb04e2f1086f18ca5df':
  add nav drawer icon zip

11 years agoadd nav drawer icon zip
Scott Main [Thu, 16 May 2013 22:02:02 +0000 (15:02 -0700)]
add nav drawer icon zip

Change-Id: I1eef61cb27ec2b50c88d6d8aa3a34495e2d4c029

11 years agoAdd route description API.
Jeff Brown [Thu, 16 May 2013 02:00:29 +0000 (19:00 -0700)]
Add route description API.

Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737

11 years agoam 06433861: am c12783a9: Add min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 21:05:18 +0000 (14:05 -0700)]
am 06433861: am c12783a9: Add min delay between disable and enable of wifi

* commit '0643386128eba71178ee3913e7c76965bd344d73':
  Add min delay between disable and enable of wifi

11 years agoam c12783a9: Add min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 21:02:49 +0000 (14:02 -0700)]
am c12783a9: Add min delay between disable and enable of wifi

* commit 'c12783a90e08bd2e20eb75f68192fbf7bad80357':
  Add min delay between disable and enable of wifi

11 years agoMerge "Move sleep from ActivityStack to Supervisor"
Craig Mautner [Thu, 16 May 2013 20:38:04 +0000 (20:38 +0000)]
Merge "Move sleep from ActivityStack to Supervisor"

11 years agoAdd min delay between disable and enable of wifi
Robert Greenwalt [Thu, 16 May 2013 19:48:20 +0000 (12:48 -0700)]
Add min delay between disable and enable of wifi

We sometimes have issues if disable, enable seq happens to fast.
This should only slow down those fast cases.

bug:8715336
Change-Id: I4f7fe9708b7c3c2300c441511838e8a70eaad5d1

11 years agoMove sleep from ActivityStack to Supervisor
Craig Mautner [Thu, 16 May 2013 20:35:39 +0000 (13:35 -0700)]
Move sleep from ActivityStack to Supervisor

- Move activitySleptLocked, checkReadyForSleepLocked,
mGoingToSleepActivities, mGoingToSleep, mSleepTimeout from
ActivityStack to ActivityStackSupervisor.

- Fix bug that was causing mGoingToSleepActivities to always be
empty.

- Add more debug logging.

Change-Id: Ibd57bd49bf6f468567571b390f3051faaeee1aa1

11 years agoam 0c8dcf4d: am c037282c: Merge "Rebind notification listeners for current user....
John Spurlock [Thu, 16 May 2013 18:12:50 +0000 (11:12 -0700)]
am 0c8dcf4d: am c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev

* commit '0c8dcf4dcf3a04d2d2b1ca7a67a8c38ca50cc619':
  Rebind notification listeners for current user.

11 years agoam c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev
John Spurlock [Thu, 16 May 2013 18:09:15 +0000 (11:09 -0700)]
am c037282c: Merge "Rebind notification listeners for current user." into jb-mr2-dev

* commit 'c037282c1ca0d7589168c73f1cf8b19ecc3ffca4':
  Rebind notification listeners for current user.

11 years agoMerge "Rebind notification listeners for current user." into jb-mr2-dev
John Spurlock [Thu, 16 May 2013 18:06:36 +0000 (18:06 +0000)]
Merge "Rebind notification listeners for current user." into jb-mr2-dev

11 years agoam f799e1f7: am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav...
Scott Main [Thu, 16 May 2013 17:59:50 +0000 (10:59 -0700)]
am f799e1f7: am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons

* commit 'f799e1f7fadbc12ba4ae3344f17cde8bdb8a6346':
  add links to nav drawer icons

11 years agoam 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:57:20 +0000 (10:57 -0700)]
am 15e102cf: am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons

* commit '15e102cf3b425484ca4eaf4d8bdab93c30d46f59':
  add links to nav drawer icons

11 years agoam 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:55:10 +0000 (10:55 -0700)]
am 6658de78: am 14f1a995: am 67823512: add links to nav drawer icons

* commit '6658de781b3826513f26383f261ad18d4cd096da':
  add links to nav drawer icons

11 years agoam 14f1a995: am 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:52:04 +0000 (10:52 -0700)]
am 14f1a995: am 67823512: add links to nav drawer icons

* commit '14f1a9959311258eea47d1fd1c30b82ceddc9808':
  add links to nav drawer icons

11 years agoam 67823512: add links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:50:13 +0000 (10:50 -0700)]
am 67823512: add links to nav drawer icons

* commit '678235122bb61304a36731e7a4ab1f4ad666980f':
  add links to nav drawer icons

11 years agoadd links to nav drawer icons
Scott Main [Thu, 16 May 2013 17:41:15 +0000 (10:41 -0700)]
add links to nav drawer icons

Change-Id: I97cf24421542d70402488f8c193c7bcc7ef7edd5

11 years agoRebind notification listeners for current user.
John Spurlock [Thu, 16 May 2013 17:42:38 +0000 (13:42 -0400)]
Rebind notification listeners for current user.

Use ForUser overload when reading setting inside system server.

Bug: 9000206
Change-Id: Ie87aed578d29425d8f32b23aeb8aa7118922c889

11 years agoam f6690e3d: am 82040986: Merge "Premium SMS popup for ISIS"
John Huang [Thu, 16 May 2013 15:49:36 +0000 (08:49 -0700)]
am f6690e3d: am 82040986: Merge "Premium SMS popup for ISIS"

* commit 'f6690e3dd637aedcedaa4ef71fcd697af08733ef':
  Premium SMS popup for ISIS

11 years agoam 82040986: Merge "Premium SMS popup for ISIS"
John Huang [Thu, 16 May 2013 15:47:19 +0000 (08:47 -0700)]
am 82040986: Merge "Premium SMS popup for ISIS"

* commit '82040986598b848830b00a068cf80c228957e173':
  Premium SMS popup for ISIS

11 years agoam 8c0eb22d: am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change...
Dirk Dougherty [Thu, 16 May 2013 15:27:28 +0000 (08:27 -0700)]
am 8c0eb22d: am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit '8c0eb22d6e6bbd2bef2fabf7a35ab87d7cdc3b74':
  Doc change: change contact form for optimization tips review decisions.

11 years agoam 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact...
Dirk Dougherty [Thu, 16 May 2013 15:25:52 +0000 (08:25 -0700)]
am 02ea97b5: am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit '02ea97b592f453e1faf591acafe374bca74d0de4':
  Doc change: change contact form for optimization tips review decisions.

11 years agoam f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for...
Dirk Dougherty [Thu, 16 May 2013 15:24:02 +0000 (08:24 -0700)]
am f7089ab0: am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'f7089ab0062b3db9858012330501cedcab3739cd':
  Doc change: change contact form for optimization tips review decisions.

11 years agoUpdate Canvas.getClipBounds to not account for AA clips.
Derek Sollenberger [Thu, 16 May 2013 13:31:27 +0000 (09:31 -0400)]
Update Canvas.getClipBounds to not account for AA clips.

This preserves the existing behavior at the SDK level while skia
investigates a more comprehensive solution.

bug: 8986473
Change-Id: Ief82dcfd47f1ba08d28d43402b3c28694f94f2e4

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 16 May 2013 12:55:35 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 74dcb8ec: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:48:18 +0000 (05:48 -0700)]
am 74dcb8ec: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '74dcb8ec6028fee78117eeb7b1cc2e2e3b06ba37':
  Fix bug managing wifi display routes.
  Donot bind to GATT service when BLE is not supported
  Exempt the notification panel from animation lockout.
  Fix network reload when config is restored
  don't trigger a render when setting the rendermode
  Fix change of behavior in Looper.quit().
  Fix enabling networks after driver stop
  Maybe fix issue #8620910: Win_sdk build failed and unable to create...
  Fix CTS failure due to invalid EAP update
  Crash on non-eng builds due to lacking null check.
  Fully setup newly bound service before state management.
  Revert GC thread changes

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:43:31 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Id3816eec8bf8ceef1883fab3f81803177588eed1

11 years agoam d73dee30: am a012887a: Merge "Doc change: change contact form for optimization...
Dirk Dougherty [Thu, 16 May 2013 07:35:37 +0000 (00:35 -0700)]
am d73dee30: am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'd73dee305b7b3b75fe2b6d5d4a99e35d65e06f85':
  Doc change: change contact form for optimization tips review decisions.

11 years agoam a012887a: Merge "Doc change: change contact form for optimization tips review...
Dirk Dougherty [Thu, 16 May 2013 07:33:29 +0000 (00:33 -0700)]
am a012887a: Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

* commit 'a012887a7856c29e77cd9b08fab16a6c26c93c57':
  Doc change: change contact form for optimization tips review decisions.

11 years agoMerge "Doc change: change contact form for optimization tips review decisions." into...
Dirk Dougherty [Thu, 16 May 2013 07:31:53 +0000 (07:31 +0000)]
Merge "Doc change: change contact form for optimization tips review decisions." into jb-mr1.1-ub-dev

11 years agoDoc change: change contact form for optimization tips review decisions.
Dirk Dougherty [Thu, 16 May 2013 07:27:42 +0000 (00:27 -0700)]
Doc change: change contact form for optimization tips review decisions.

Change-Id: Ib4d5c5d4a5d078fb7b5612d5908515032e69f565

11 years agoMerge "Premium SMS popup for ISIS"
John Huang [Thu, 16 May 2013 02:31:43 +0000 (02:31 +0000)]
Merge "Premium SMS popup for ISIS"

11 years agoMerge "Add API to retrieve cursor notification URI."
Dianne Hackborn [Wed, 15 May 2013 23:25:24 +0000 (23:25 +0000)]
Merge "Add API to retrieve cursor notification URI."

11 years agoPremium SMS popup for ISIS
Sangcheol Lee [Fri, 26 Apr 2013 07:03:24 +0000 (16:03 +0900)]
Premium SMS popup for ISIS

Premium SMS popup warning during ISIS Wallet activation must be removed

Change-Id: Ib0bd4b1f2ee37abc8becc64e20ae73337f0381aa

11 years agoAdd API to retrieve cursor notification URI.
Dianne Hackborn [Tue, 14 May 2013 20:44:29 +0000 (13:44 -0700)]
Add API to retrieve cursor notification URI.

Change-Id: I89f6c4d6ee6ef3675eff62ff6bca691b54c69f75

11 years agoam 1a876709: am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons...
Scott Main [Wed, 15 May 2013 21:55:25 +0000 (14:55 -0700)]
am 1a876709: am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '1a876709381b3c2e7eb3e780ce0202b3703d6757':
  add tags to lessons in navigation class

11 years agoam 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation...
Scott Main [Wed, 15 May 2013 21:54:11 +0000 (14:54 -0700)]
am 94160cd1: am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '94160cd1d72ee0d74ddd70298811cbe16e2ef0db':
  add tags to lessons in navigation class

11 years agoam 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:52:39 +0000 (14:52 -0700)]
am 93657665: am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '93657665845a61ccf33a81e62a922163234b8cb3':
  add tags to lessons in navigation class

11 years agoam 65b68f4a: am 0c39152f: add tags to lessons in navigation class
Scott Main [Wed, 15 May 2013 21:50:03 +0000 (14:50 -0700)]
am 65b68f4a: am 0c39152f: add tags to lessons in navigation class

* commit '65b68f4a760dc029805aff5f1fa804a3420ac38c':
  add tags to lessons in navigation class