Christopher Tate
a28e854683
Move full backup/restore onto dedicated threads
...
Running full backup/restore on the Backup Manager looper thread causes problems.
It not only interfered with the delayed-Message timeout processing; in the case
of installing apks during restore it also interfered fatally with the interaction
between the Package Manager and install-time restore of data from the cloud.
The long-term right thing to do here will be a refactoring of full backup and
restore to be structured as the sort of state-machine process that incremental
backup and restore now use. This is particularly thorny in the case of full
restore (due to the Package Manager interactions), and full backup/restore are
considered experimental at this point, so that refactoring is deferred to a
future release. The current process is essentially standalone, so the bug is
fixed here pro tem by letting it run to completion on its own thread, freeing
the looper for normal work.
Fixes bug 5173450
Change-Id: I659a61afa18ffe7fde1a07f7fa0e860d5e8d5a89
2011-09-12 13:45:21 -07:00
Gilles Debunne
d6fe256ae4
am fc7a8081: Merge "If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up."
...
* commit 'fc7a8081f8d9ca3c2891d3c2d748dc26f8139ed6':
If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up.
2011-09-12 13:32:40 -07:00
Gilles Debunne
fc7a8081f8
Merge "If suggestion span is not enable, removes the suggestion span (so no underline is displayed), and do not try to display the suggestion pop-up."
2011-09-12 13:30:26 -07:00
Romain Guy
27f84cfd67
am 3e1dc03a: Merge "Turn hinting back on"
...
* commit '3e1dc03a1a2c324f95c3d0183e8799adfedd143d':
Turn hinting back on
2011-09-12 13:17:50 -07:00
Romain Guy
3e1dc03a1a
Merge "Turn hinting back on"
2011-09-12 13:16:28 -07:00
Romain Guy
f68832bcc1
Turn hinting back on
...
The difference is not obvious when compared to no hinting, and turning
off hinting has undesirable side effects because of the lack of sub-
pixel positioning when rendering text.
Change-Id: If2162ba079f68f33b33aed444e80036fdbf015bb
2011-09-12 13:14:42 -07:00
Stephen Hines
97576bf08d
am 83699047: Merge "Add simple test for reference counting."
...
* commit '836990472e6068a757592dbcc39eaa5e4db8099d':
Add simple test for reference counting.
2011-09-12 12:49:02 -07:00
Stephen Hines
9b73a5c1c8
am 4a511750: Merge "Add int and missing fp tests to RSTest."
...
* commit '4a5117500c070ce3c3e73e7cf141fd042b655cef':
Add int and missing fp tests to RSTest.
2011-09-12 12:48:59 -07:00
Stephen Hines
836990472e
Merge "Add simple test for reference counting."
2011-09-12 12:47:12 -07:00
Stephen Hines
4a5117500c
Merge "Add int and missing fp tests to RSTest."
2011-09-12 12:47:07 -07:00
Dianne Hackborn
d2509fd835
Add boot mode where only "core apps" are started.
...
A core app is one that has coreApp="true" in its manifest tag.
The system can successfully boot (though a little painfully) with
only framework-res.apk, SettingsProvider.apk, SystemUI.apk,
DefaultContainerService.apk, and Launcher2.apk set as core apps.
Currently this boot mode is always turned off.
Change-Id: Ieaa4a8031c2c391a12996aa8d8b1d65fc2b09d6b
2011-09-12 12:29:43 -07:00
Irfan Sheriff
e53230f1ec
am 45caa447: Merge "Emergency callback mode handling"
...
* commit '45caa44717d047e0aa0a066c352eee00a6ea2f11':
Emergency callback mode handling
2011-09-12 12:25:58 -07:00
Irfan Sheriff
45caa44717
Merge "Emergency callback mode handling"
2011-09-12 12:24:05 -07:00
Fred Quintana
efac6e1902
am 76eb1a25: Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""
...
* commit '76eb1a251808438771a237a92a0ab0903baeea7e':
Revert "Make the SyncManager timeout syncs if it takes too long to bind to them."
2011-09-12 12:19:55 -07:00
Fred Quintana
76eb1a2518
Merge "Revert "Make the SyncManager timeout syncs if it takes too long to bind to them.""
2011-09-12 12:17:54 -07:00
Costin Manolache
b61e8fbabe
For consistency with getAuthToken, pass UID/PID for add account. Needed for customizing the add account flow
...
b/5278759 API changes to pass package, options
b/5249018 consistent/customized add account UI
b/5270079 tag who adds the account
Change-Id: I1ee211d751b565c725c89aa1a429ef2f5bebe34a
2011-09-12 12:11:24 -07:00
Jeff Brown
eab3f9de49
am 6515f50d: Merge "Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814"
...
* commit '6515f50d0c759cfff163aaf7f42a970019d93923':
Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814
2011-09-12 11:28:21 -07:00
Jeff Brown
6515f50d0c
Merge "Handle DOWN/MOVE/UP gestures with fling. Bug: 5265814"
2011-09-12 11:26:58 -07:00
Gilles Debunne
f9d99d5338
am e9a9dbe7: Merge "The back key stops selection mode in extracted text mode."
...
* commit 'e9a9dbe729f4e4d4a54a7783e9768b9742240e25':
The back key stops selection mode in extracted text mode.
2011-09-12 11:21:03 -07:00
Gilles Debunne
e9a9dbe729
Merge "The back key stops selection mode in extracted text mode."
2011-09-12 11:19:06 -07:00
Fred Quintana
87b146625a
Revert "Make the SyncManager timeout syncs if it takes too long to bind to them."
...
This reverts commit bf3c634dc5bea1d6188efaba159b1ecbc038a4f7
Bug: 5290505
Change-Id: I11a681b48360f5c200a0602c4daf30ae82b4209c
2011-09-12 10:50:53 -07:00
Eric Fischer
b966b87af3
am d61a3a1b: Merge "Import revised translations."
...
* commit 'd61a3a1bed57fc33fb0fa132521746bb58bba6be':
Import revised translations.
2011-09-12 10:24:26 -07:00
Eric Fischer
d61a3a1bed
Merge "Import revised translations."
2011-09-12 10:22:21 -07:00
Daniel Sandler
c2ea58b4d6
am aeb11675: Merge "Hide navigation buttons when they are DISABLEd."
...
* commit 'aeb116750110cf9cc1ef82d208f3a8ba3b8be009':
Hide navigation buttons when they are DISABLEd.
2011-09-12 10:08:15 -07:00
Luca Zanolin
e076045f10
If suggestion span is not enable, removes the suggestion span (so no underline is displayed),
...
and do not try to display the suggestion pop-up.
Bug: 5267093
Change-Id: Ia6f2596d0c62885ef9affeb478e00d3b92d76aac
2011-09-12 18:07:31 +01:00
Daniel Sandler
aeb1167501
Merge "Hide navigation buttons when they are DISABLEd."
2011-09-12 10:06:53 -07:00
Mangesh Ghiware
c031597180
am fa0d2316: Merge "On zoom to overview, reflow text, if necessary."
...
* commit 'fa0d2316f98ab787ff26383ff651dc31aac60ffd':
On zoom to overview, reflow text, if necessary.
2011-09-12 09:50:06 -07:00
Eric Fischer
78cc91aa7d
Import revised translations.
...
Change-Id: I6e7f33ff16557f7e9088c0aa66fd1c79ed376c75
2011-09-12 09:48:06 -07:00
Jaikumar Ganesh
44c828e7ca
am 049f5cc3: Merge "Don\'t override the hash code for the channel."
...
* commit '049f5cc3de8e30d05a26e135ab0978b3e1fe62b4':
Don't override the hash code for the channel.
2011-09-12 09:48:06 -07:00
Mangesh Ghiware
fa0d2316f9
Merge "On zoom to overview, reflow text, if necessary."
2011-09-12 09:46:49 -07:00
Jaikumar Ganesh
049f5cc3de
Merge "Don't override the hash code for the channel."
2011-09-12 09:45:20 -07:00
The Android Open Source Project
be13575959
am 92bda84b: Reconcile with gingerbread-release
...
* commit '92bda84b11ba2aec98036313784444d9f5aebc9a':
one more api missed
missed part of https://android-git.corp.google.com/g/#/c/104540/
missed aidl change in previous merge
bring nfc-extras up to date (same as gingerbread)
2011-09-12 07:49:53 -07:00
The Android Open Source Project
92bda84b11
Reconcile with gingerbread-release
...
Change-Id: I4b6c483135fc0cb50e6de6c2fde845842c29e25c
2011-09-12 07:46:51 -07:00
satok
ad05f6be86
am d2deee1e: Merge "Fix the visiblity of the ime switcher icon."
...
* commit 'd2deee1eeb4de93b2d5158dcfc79b1bb68accf79':
Fix the visiblity of the ime switcher icon.
2011-09-12 00:28:35 -07:00
satok
d2deee1eeb
Merge "Fix the visiblity of the ime switcher icon."
2011-09-12 00:25:41 -07:00
satok
9747f8977c
Fix the visiblity of the ime switcher icon.
...
Bug: 5288866
Change-Id: I99b4aee36c337b2fab1116e9245ddecd826c840c
2011-09-12 15:56:40 +09:00
Irfan Sheriff
616f3173e0
Emergency callback mode handling
...
For wifi, track ECM and shut down and restart when device
goes in ECM and out
For p2p, simply turn off when in ECM mode
Bug: 5185246
Change-Id: I5f5bf75fac3e27db1d7c412135c796f2b137263d
2011-09-11 22:56:17 -07:00
Daniel Sandler
029d5877b0
Hide navigation buttons when they are DISABLEd.
...
Back is hidden by DISABLE_BACK; Home, Recents, and Menu are
hidden by DISABLE_NAVIGATION.
Bug: 5261576
Bug: 5284740 (confusion about visible inactive icons)
Change-Id: I410c133b737cc11d61bac0318dc24458353ee7b3
2011-09-12 01:02:30 -04:00
Ken Wakasa
be5f2081d6
am e00633e4: Fix NPE
...
* commit 'e00633e49a7136e14da8ce9938cf6a3333f28498':
Fix NPE
2011-09-11 20:37:43 -07:00
Ken Wakasa
e00633e49a
Fix NPE
...
bug: 5290369
Change-Id: Ica450c49fc0bc89b1697eaa1086707f481f6be7e
2011-09-12 12:18:09 +09:00
Daniel Sandler
4aa614ea56
am f4b783f8: Merge "Exit the keyguard when the user clicks a notification."
...
* commit 'f4b783f8a7f7ba56a879b0fce075257659e9f909':
Exit the keyguard when the user clicks a notification.
2011-09-11 17:10:33 -07:00
Daniel Sandler
2d2e97bdb1
am 8dbdee5b: Merge "Fix bug swiping away NO_CLEAR notifications."
...
* commit '8dbdee5b167b066f8306a43db4e2a8d410b0370b':
Fix bug swiping away NO_CLEAR notifications.
2011-09-11 17:10:30 -07:00
Daniel Sandler
f4b783f8a7
Merge "Exit the keyguard when the user clicks a notification."
2011-09-11 17:08:50 -07:00
Daniel Sandler
8dbdee5b16
Merge "Fix bug swiping away NO_CLEAR notifications."
2011-09-11 17:08:41 -07:00
Ben Komalo
4b2efcb26f
am 6c048260: Merge "Revert encryption mapping for device wipes."
...
* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
Revert encryption mapping for device wipes.
2011-09-11 16:53:00 -07:00
Ben Komalo
6c048260f3
Merge "Revert encryption mapping for device wipes."
2011-09-11 16:48:32 -07:00
Amith Yamasani
da286299f4
am 48b39148: Merge "Fix preference screen padding for legacy apps (non Holo)."
...
* commit '48b391480519c5d6cb4428af6b29b1e3405e4601':
Fix preference screen padding for legacy apps (non Holo).
2011-09-11 15:59:47 -07:00
Amith Yamasani
48b3914805
Merge "Fix preference screen padding for legacy apps (non Holo)."
2011-09-11 15:58:31 -07:00
Neal Nguyen
eaa24ce9aa
am e1e0613a: Merge "Fixing DownloadManager Test app."
...
* commit 'e1e0613aa17df7eb8c148dff57b0e6ceec383d5c':
Fixing DownloadManager Test app.
2011-09-11 15:00:21 -07:00
Neal Nguyen
e1e0613aa1
Merge "Fixing DownloadManager Test app."
2011-09-11 14:58:02 -07:00