Robert Greenwalt
e0fc187549
am dfbf9901: am 5c11e8ee: Fix off-by-1 error in timing
...
* commit 'dfbf9901b4c16c6f7658d3e8bdb1573886c927e4':
Fix off-by-1 error in timing
2013-05-20 09:44:42 -07:00
Robert Greenwalt
dfbf9901b4
am 5c11e8ee: Fix off-by-1 error in timing
...
* commit '5c11e8ee5463b88907814e3e8716af292f90fb86':
Fix off-by-1 error in timing
2013-05-20 09:43:17 -07:00
Robert Greenwalt
5c11e8ee54
Fix off-by-1 error in timing
...
If deferred action msg was delivered promptly it would end up
looking like it too needed to be deferred and then nothing
would end up getting done.
bug:9014777
Change-Id: I243df70463ebb9333efd6df510f71f9d8d9bdf91
2013-05-20 09:28:08 -07:00
The Android Open Source Project
30dbdfff1b
am 2eed10ac: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0':
Fix issue #9000597 : PackageManager get NPE while running performance plan
2013-05-20 08:22:43 -07:00
The Android Open Source Project
2eed10ac3f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702
2013-05-20 08:20:20 -07:00
The Android Automerger
1f3fa2cfeb
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-20 05:55:17 -07:00
Robert Greenwalt
a75ab0337a
am c3de50cd: am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
...
* commit 'c3de50cd3cff76082bc01b04a8a6bbde300d725e':
Add some temp wifi debugging output
2013-05-19 12:51:47 -07:00
Robert Greenwalt
c3de50cd3c
am 30c798d5: Merge "Add some temp wifi debugging output" into jb-mr2-dev
...
* commit '30c798d58772efd595fffebd9d0d54f717e34ed6':
Add some temp wifi debugging output
2013-05-19 12:49:44 -07:00
Robert Greenwalt
30c798d587
Merge "Add some temp wifi debugging output" into jb-mr2-dev
2013-05-19 19:46:58 +00:00
The Android Automerger
665191bb4b
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-19 05:55:27 -07:00
John Spurlock
fb16a68cc6
am c6ab8a61: am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev
...
* commit 'c6ab8a614767cae1fc9df5984414c9f15ea7b588':
Deactivate notification listeners disabled at runtime.
2013-05-19 01:25:34 -07:00
John Spurlock
c6ab8a6147
am d0154550: Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev
...
* commit 'd0154550e0d5e8dea5b65849747266f5fa0d2d5d':
Deactivate notification listeners disabled at runtime.
2013-05-19 01:23:30 -07:00
John Spurlock
d0154550e0
Merge "Deactivate notification listeners disabled at runtime." into jb-mr2-dev
2013-05-19 08:03:48 +00:00
Robert Greenwalt
02ba86f0cc
Add some temp wifi debugging output
...
bug: 9014777
Change-Id: I38c61f235742a36be10cdf9125e19ac9406a61b9
2013-05-18 13:40:49 -07:00
John Spurlock
79f7892c10
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
2013-05-18 14:29:40 -04:00
Brett Chabot
98354974f9
am 6ffce75f: am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev
...
* commit '6ffce75fa78fba82bde8f1df5828d177457b7a7a':
Fix PhoneWindowManager#getUserRotationMode
2013-05-17 17:19:02 -07:00
Santos Cordon
5c6370a405
am 8e3f01e9: am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
...
* commit '8e3f01e90ed51b055e0addb7d5114b732bd514b9':
Update documentation of NEW_OUTGOING_CALL
2013-05-17 17:19:00 -07:00
Brett Chabot
6ffce75fa7
am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev
...
* commit '154bb5597cbd3985e3ab86647c5feaa2e289e1a9':
Fix PhoneWindowManager#getUserRotationMode
2013-05-17 17:16:47 -07:00
Santos Cordon
8e3f01e90e
am c1de2404: Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
...
* commit 'c1de240457ad803c04c56fb3f63635966b862b43':
Update documentation of NEW_OUTGOING_CALL
2013-05-17 17:16:45 -07:00
Brett Chabot
154bb5597c
Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev
2013-05-18 00:15:25 +00:00
Santos Cordon
c1de240457
Merge "Update documentation of NEW_OUTGOING_CALL" into jb-mr2-dev
2013-05-18 00:14:14 +00:00
Romain Guy
7309947eb6
Merge "Clear display lists when a View becomes GONE/INVISIBLE"
2013-05-18 00:11:50 +00:00
Romain Guy
aa29a97f6d
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
2013-05-17 17:07:47 -07:00
Santos Cordon
ba70136713
Update documentation of NEW_OUTGOING_CALL
...
Adds call-handling as a use case for NEW_OUTGOING_CALL
bug: 8987211
Change-Id: Icd9c53a2dd1a5948a749e133600db21c2560fd1f
2013-05-17 15:58:12 -07:00
Chris Wren
0f7a734050
am 5baf581d: am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev
...
* commit '5baf581d58a86a0f9ea9689a1418b925ac49021e':
disable notification listeners on uninstall
2013-05-17 15:10:22 -07:00
Chris Wren
5baf581d58
am 743054f5: Merge "disable notification listeners on uninstall" into jb-mr2-dev
...
* commit '743054f5b3ad088b00adac44bb6d1f542d4375db':
disable notification listeners on uninstall
2013-05-17 15:08:19 -07:00
Chris Wren
743054f5b3
Merge "disable notification listeners on uninstall" into jb-mr2-dev
2013-05-17 22:06:14 +00:00
Michael Wright
a7f7a5a30e
am 1aa4bec5: am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices
...
* commit '1aa4bec5e41628dc6086436331a37b5174a001df':
Remove assist swipe from TOUCH_NAVIGATION devices
2013-05-17 14:59:25 -07:00
Michael Wright
1aa4bec5e4
am 4361e1f4: Remove assist swipe from TOUCH_NAVIGATION devices
...
* commit '4361e1f46ef9e30c78679b5e2717b74d66191692':
Remove assist swipe from TOUCH_NAVIGATION devices
2013-05-17 14:57:25 -07:00
Michael Wright
4361e1f46e
Remove assist swipe from TOUCH_NAVIGATION devices
...
Bug: 9019927
Change-Id: I0a67ee00038b6fba7818f64ba02515767e34fe06
(cherry picked from commit 681a3d710402b80a8375a05172b1fb6f720295be)
2013-05-17 21:30:02 +00:00
Romain Guy
4eb3c13261
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.
2013-05-17 14:14:32 -07:00
Romain Guy
25f6f4f5d0
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.
2013-05-17 14:12:43 -07:00
Romain Guy
3c1ad55fcf
Merge "Update Canvas.getClipBounds to not account for AA clips." into jb-mr2-dev
2013-05-17 21:10:22 +00:00
Dianne Hackborn
cff74a08fb
Fix issue #9000597 : PackageManager get NPE while running performance plan
...
Change-Id: I2bf777e8b15704d21320f95059d94648122396a8
2013-05-17 13:49:04 -07:00
Dianne Hackborn
9f337b694a
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
2013-05-17 13:36:21 -07:00
Dianne Hackborn
46449b8bbc
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
2013-05-17 13:34:30 -07:00
Dianne Hackborn
d31db759cb
Merge "Fix issue #9000597 : PackageManager get NPE while running performance plan" into jb-mr2-dev
2013-05-17 20:31:44 +00:00
Chris Wren
ae9bb5737c
disable notification listeners on uninstall
...
Bug: 8979640
Change-Id: I9f1d118e5ce210b829476e0971f3d55fc778c227
2013-05-17 16:02:53 -04:00
The Android Open Source Project
56cf63f8ec
am b4667497: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit 'b46674978765e29d838eb7e5d4810d047037f855':
Add min delay between disable and enable of wifi
2013-05-17 12:59:37 -07:00
The Android Open Source Project
b466749787
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Id080dc52375e30cfad7c1b6df9be754c2bb8c6fa
2013-05-17 12:54:33 -07:00
Jeff Brown
2feefe01e9
am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev
...
* commit 'b7871af2fbde70c7cf4812d5710b2729588bac54':
Add route description API.
2013-05-17 12:46:08 -07:00
Jeff Brown
b7871af2fb
am 50ab525a: Merge "Add route description API." into jb-mr2-dev
...
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
Add route description API.
2013-05-17 12:44:37 -07:00
Jeff Brown
50ab525af6
Merge "Add route description API." into jb-mr2-dev
2013-05-17 19:41:11 +00:00
Baligh Uddin
cde3905e0d
am d29accc6: (-s ours) am 9cd4e67e: Import translations. DO NOT MERGE
...
* commit 'd29accc6990884ba054a1a22867a3acae4bee18b':
Import translations. DO NOT MERGE
2013-05-17 12:12:00 -07:00
Baligh Uddin
d29accc699
am 9cd4e67e: Import translations. DO NOT MERGE
...
* commit '9cd4e67e10f86710734db5e2e8659e1346f3c041':
Import translations. DO NOT MERGE
2013-05-17 12:09:28 -07:00
Baligh Uddin
4bc5a36f40
Merge "Import translations. DO NOT MERGE"
2013-05-17 19:09:28 +00:00
Baligh Uddin
0670cfb7c4
Merge "Import translations. DO NOT MERGE"
2013-05-17 19:07:56 +00:00
Dianne Hackborn
2c44c74b88
Fix issue #9000597 : PackageManager get NPE while running performance plan
...
Change-Id: I2bf777e8b15704d21320f95059d94648122396a8
2013-05-17 12:07:21 -07:00
Baligh Uddin
96bab3ee26
Import translations. DO NOT MERGE
...
Change-Id: Id6d49e71d91347df267d43230558dc62ac7aa644
Auto-generated-cl: translation import
2013-05-17 10:32:11 -07:00
Baligh Uddin
273c5cebde
Import translations. DO NOT MERGE
...
Change-Id: Ie03d0a42bd86ef4956ade788cd7db9522e8e1e2e
Auto-generated-cl: translation import
2013-05-17 10:23:58 -07:00