Amith Yamasani
52a09754e0
am af71f2ac: am 44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
...
* commit 'af71f2ac9423918be8ac1191df9c223a2744bb38':
Avoid re-creating a user when activity is resumed
2012-08-25 22:12:55 -07:00
Amith Yamasani
af71f2ac94
am 44120d19: Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
...
* commit '44120d19f33f14b0a6f1b2c656335a476de406ee':
Avoid re-creating a user when activity is resumed
2012-08-25 22:11:20 -07:00
Amith Yamasani
44120d19f3
Merge "Avoid re-creating a user when activity is resumed" into jb-mr1-dev
2012-08-25 22:09:53 -07:00
Amith Yamasani
fd7aa8d4b2
am 07e3716b: am b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
...
* commit '07e3716b7e485982b9b024249d2f7a9b09e529df':
Settings: Fix crash seen when setting the radio band
2012-08-25 21:56:54 -07:00
Amith Yamasani
07e3716b7e
am b1491842: Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
...
* commit 'b1491842c48fd0cda2539ee98a30fa82a744af15':
Settings: Fix crash seen when setting the radio band
2012-08-25 21:55:24 -07:00
Amith Yamasani
b1491842c4
Merge "Settings: Fix crash seen when setting the radio band" into jb-mr1-dev
2012-08-25 21:52:39 -07:00
Jeevaka Badrappan
cf6d99aac1
Settings: Fix crash seen when setting the radio band
...
When the user presses back before the set radio band
result dialog is shown, crash is seen as the activity
associated with this is already finishing.
Check the activity status before displaying the
set radio band result alert dialog.
Change-Id: I34104773f5cce0be6d0021823b2889aad0fdb945
Author: Jeevaka Badrappan <jeevaka.badrappan@intel.com >
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com >
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
Signed-off-by: Jack Ren <jack.ren@intel.com >
Author-tracking-BZ: 39317
2012-08-25 21:50:26 -07:00
Amith Yamasani
fcfc9900d9
am d3d801c9: am 5e61ba55: am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
...
* commit 'd3d801c9a9a7876d7b73f930db3c8b1395775597':
Settings: Fix crash seen when setting the radio band
2012-08-25 13:01:51 -07:00
Amith Yamasani
d3d801c9a9
am 5e61ba55: am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
...
* commit '5e61ba5576d912c42af004510484a77625a96d44':
Settings: Fix crash seen when setting the radio band
2012-08-25 13:00:19 -07:00
Amith Yamasani
5e61ba5576
am 41446512: am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
...
* commit '41446512cfa6e009187b7cc67fa34a29f82ddccc':
Settings: Fix crash seen when setting the radio band
2012-08-25 12:58:18 -07:00
Amith Yamasani
41446512cf
am 52d996ed: Merge "Settings: Fix crash seen when setting the radio band"
...
* commit '52d996edeb7958d386bbf6655e9acfec3b10fdf2':
Settings: Fix crash seen when setting the radio band
2012-08-25 12:56:23 -07:00
Amith Yamasani
52d996edeb
Merge "Settings: Fix crash seen when setting the radio band"
2012-08-25 11:55:42 -07:00
Amith Yamasani
92e2b4f4af
Avoid re-creating a user when activity is resumed
...
onCreate() was getting called again, resulting in another user being
created. Keeping the new userid across pause/resume.
Change-Id: Id7930227895e95a60a77efddf361ab9408a8f797
2012-08-25 07:47:43 -07:00
The Android Open Source Project
583f62f75e
am aecda495: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'aecda4950b9ef92285bb1755183c2b10e6c2c2c5':
Show the license dialog only if the activity is still showing
2012-08-25 07:21:30 -07:00
The Android Open Source Project
aecda4950b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: If68758d7bb648f89c4a663ca6bcc419f380518e8
2012-08-25 07:17:23 -07:00
Baligh Uddin
e286d7dead
am 8bd1a323: (-s ours) am cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit '8bd1a3234ac81bc3d26de72647ad611615273f62':
Import translations. DO NOT MERGE
2012-08-24 15:06:58 -07:00
Baligh Uddin
8bd1a3234a
am cf033092: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'cf033092732809d1ea0734f1f761617a8c4ccd32':
Import translations. DO NOT MERGE
2012-08-24 15:05:21 -07:00
Baligh Uddin
cf03309273
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-24 15:03:15 -07:00
Baligh Uddin
56d7fa5ed5
Merge "Import translations. DO NOT MERGE"
2012-08-24 15:02:56 -07:00
Dianne Hackborn
47401d924f
am 15b07df7: am 2e3c7509: Make settings a little aware of multi-user install.
...
* commit '15b07df79467aeabbe185a38397a90b2961a61b1':
Make settings a little aware of multi-user install.
2012-08-24 14:42:55 -07:00
Dianne Hackborn
15b07df794
am 2e3c7509: Make settings a little aware of multi-user install.
...
* commit '2e3c75094bde1cfca1b15f66f5ff3d0a85baf0a0':
Make settings a little aware of multi-user install.
2012-08-24 14:40:15 -07:00
Baligh Uddin
eb6f32285c
Import translations. DO NOT MERGE
...
Change-Id: I283e428d001ac5b313bc01836db8f1519f29d33f
Auto-generated-cl: translation import
2012-08-24 13:32:09 -07:00
Baligh Uddin
7b139fa097
Import translations. DO NOT MERGE
...
Change-Id: I8087ddd4451aef7aa8b07a1ab4019aab89723d8d
Auto-generated-cl: translation import
2012-08-24 13:29:14 -07:00
Dianne Hackborn
2e3c75094b
Make settings a little aware of multi-user install.
...
Change-Id: Id04f137dbc80dfee7b6c436efc2225ceccb88faa
2012-08-24 13:13:46 -07:00
Jeff Sharkey
3f5a277c3c
am 841c492e: am f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
...
* commit '841c492eda689b438d2d8385009696d5119a8e02':
Migrate legacy VPN arguments to system_server.
2012-08-24 11:36:31 -07:00
Jeff Sharkey
841c492eda
am f3de41a2: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
...
* commit 'f3de41a24d779c9fae6517ceb13596290076b600':
Migrate legacy VPN arguments to system_server.
2012-08-24 11:34:17 -07:00
Jeff Sharkey
f3de41a24d
Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev
2012-08-24 11:33:02 -07:00
Jeff Sharkey
745e6212e7
Migrate legacy VPN arguments to system_server.
...
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.
Bug: 5756357
Change-Id: Ied048ca465aab03b2ae1c004388f49b82848b3f7
2012-08-24 11:17:57 -07:00
Jean-Baptiste Queru
22ab662ad8
am f741006e: am 534529d0: am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit 'f741006e7e542cebaa75fb3c05ade59a1f1d0891':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-24 07:34:55 -07:00
Jean-Baptiste Queru
f741006e7e
am 534529d0: am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit '534529d0cc08b5559aef2650d58aaf48c04727a0':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-24 07:32:22 -07:00
Jean-Baptiste Queru
534529d0cc
am 88f37936: am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit '88f379367f208a75dfe95a081b25c27a54b06a1a':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-24 07:29:43 -07:00
Baligh Uddin
07de485255
am ebf1a4cc: (-s ours) am a5c6d6b3: Import translations. DO NOT MERGE
...
* commit 'ebf1a4cc6ae72e0790dd409b3d25890d415c782a':
Import translations. DO NOT MERGE
2012-08-23 19:00:03 -07:00
Baligh Uddin
ebf1a4cc6a
am a5c6d6b3: Import translations. DO NOT MERGE
...
* commit 'a5c6d6b32f2a5fe562dd77389d26c03c4b6f2e51':
Import translations. DO NOT MERGE
2012-08-23 18:58:28 -07:00
Baligh Uddin
9bb2f8d298
Import translations. DO NOT MERGE
...
Change-Id: I4469d469295c80f83cece04b90681ab4f35c5488
Auto-generated-cl: translation import
2012-08-23 18:13:40 -07:00
Baligh Uddin
a5c6d6b32f
Import translations. DO NOT MERGE
...
Change-Id: I9f722cc1c8451683f176ec7de9c62931426072f2
Auto-generated-cl: translation import
2012-08-23 18:11:17 -07:00
Amith Yamasani
36bbd58cff
Show the license dialog only if the activity is still showing
...
Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
2012-08-23 14:20:31 -07:00
Amith Yamasani
09c9671300
am b7808c71: am 6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
...
* commit 'b7808c71873f80dd4fb8c040960e92dd82b4b908':
Show the license dialog only if the activity is still showing
2012-08-23 11:54:15 -07:00
Amith Yamasani
b7808c7187
am 6413d965: Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
...
* commit '6413d9658b0b7ac425621c488eb7c13b4fd295f4':
Show the license dialog only if the activity is still showing
2012-08-23 11:30:45 -07:00
Amith Yamasani
6413d9658b
Merge "Show the license dialog only if the activity is still showing" into jb-mr1-dev
2012-08-23 11:28:07 -07:00
Amith Yamasani
cd98f810f5
Show the license dialog only if the activity is still showing
...
Bug: 6888990
Change-Id: Ide267739c7fd296356f26293f02bd794906fbd0a
2012-08-23 11:25:18 -07:00
John Spurlock
d06529ee2e
am 156d6afa: am 05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
...
* commit '156d6afa77ee8a8bff2fc6398142b9204ba54b92':
Settings: Minimal refactor to support new dreams api.
2012-08-23 10:51:15 -07:00
John Spurlock
156d6afa77
am 05b5097d: Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
...
* commit '05b5097d1871fc445fec27734b2f667539a13da0':
Settings: Minimal refactor to support new dreams api.
2012-08-23 10:48:30 -07:00
John Spurlock
05b5097d18
Merge "Settings: Minimal refactor to support new dreams api." into jb-mr1-dev
2012-08-23 10:47:16 -07:00
Jean-Baptiste Queru
88f379367f
am 1183f487: Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
...
* commit '1183f487c8ea8660415fcd30914844e8dc2de2bb':
MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
2012-08-23 09:47:04 -07:00
Jean-Baptiste Queru
1183f487c8
Merge "MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active"
2012-08-23 09:31:36 -07:00
John Spurlock
e5a84b2ea1
Settings: Minimal refactor to support new dreams api.
...
Fix breaking changes to the dreams api. Master toggle
and multiple dreams support in Settings will be done in
a subsequent change.
Bug:7028665
Change-Id: Ia56dd00ec50323fbba06473b1747e5015a3f1898
2012-08-23 10:21:50 -04:00
The Android Automerger
89d74ef167
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-23 06:34:15 -07:00
Baligh Uddin
0be2ee4112
am ba2ab869: (-s ours) am e3a49d76: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'ba2ab869e9598383cf19397ea980925bd7fd1c07':
Import translations. DO NOT MERGE
2012-08-22 19:43:19 -07:00
Baligh Uddin
ba2ab869e9
am e3a49d76: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
...
* commit 'e3a49d7665b6eda9a19375bb4f306113163ddc93':
Import translations. DO NOT MERGE
2012-08-22 19:41:22 -07:00
Baligh Uddin
e3a49d7665
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-22 19:39:05 -07:00
