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
Baligh Uddin
b35a9b6811
Merge "Import translations. DO NOT MERGE"
2012-08-22 19:38:22 -07:00
Amith Yamasani
9d290115d4
am 9a53625b: am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
...
* commit '9a53625bd039abc5b08fd26e9d35e25c5268bfd1':
Simplify User management settings to bare minimum
2012-08-22 18:49:15 -07:00
Amith Yamasani
9a53625bd0
am b18d58bd: Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
...
* commit 'b18d58bdf5501a50d4a2d726c875676b16a657e2':
Simplify User management settings to bare minimum
2012-08-22 18:47:11 -07:00
Amith Yamasani
b18d58bdf5
Merge "Simplify User management settings to bare minimum" into jb-mr1-dev
2012-08-22 18:45:52 -07:00
Amith Yamasani
8e79d3ec80
Simplify User management settings to bare minimum
...
No need to restrictions or account association at this time.
Change-Id: Ic4ae43d5bb9d4308e67499495d44c12de9e61777
2012-08-22 18:43:54 -07:00
The Android Open Source Project
680705bed4
am f1a3161e: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f1a3161ef3b51226ddea9b81eb673bb127a953fa':
2012-08-22 15:39:54 -07:00
The Android Open Source Project
f1a3161ef3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I85140e245de7ea2f1cb63252294e4cfe71b8006e
2012-08-22 15:36:24 -07:00
Irfan Sheriff
53c4523f85
am aea749fa: am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev
...
* commit 'aea749fa94f9d1c0b5dd7c16247b8c2eeca23462':
Simplify proxy regex
2012-08-22 14:25:28 -07:00
Irfan Sheriff
aea749fa94
am 9e0fdfec: Merge "Simplify proxy regex" into jb-mr1-dev
...
* commit '9e0fdfec70f181ec71198822fa39e749248c5f87':
Simplify proxy regex
2012-08-22 14:24:20 -07:00
Irfan Sheriff
9e0fdfec70
Merge "Simplify proxy regex" into jb-mr1-dev
2012-08-22 14:21:41 -07:00
Irfan Sheriff
e8d4f2f98b
Simplify proxy regex
...
Bug: 6950756
Change-Id: I535be03073cf9f502631498939c841f88fb1617d
2012-08-22 14:19:52 -07:00
Baligh Uddin
ee1a2a65e5
Import translations. DO NOT MERGE
...
Change-Id: Iefc2d9fb4059b9ffb4a1e08d0269907ce7ca73cc
Auto-generated-cl: translation import
2012-08-22 13:01:07 -07:00
Baligh Uddin
3a61dea4bf
Import translations. DO NOT MERGE
...
Change-Id: I8a85d98874da3ff59642198c05dccfe50974fdcd
Auto-generated-cl: translation import
2012-08-22 12:58:12 -07:00
Irfan Sheriff
fa8c1fc833
am 5a2dce60: am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev
...
* commit '5a2dce6092c9686f285652da42ca8d0556b7b17d':
Update view on UI thread
2012-08-22 12:19:01 -07:00
Irfan Sheriff
5a2dce6092
am 50c1e5de: Merge "Update view on UI thread" into jb-mr1-dev
...
* commit '50c1e5dee8e45edf8f7593c722399735659127e7':
Update view on UI thread
2012-08-22 12:17:13 -07:00
Irfan Sheriff
50c1e5dee8
Merge "Update view on UI thread" into jb-mr1-dev
2012-08-22 11:57:18 -07:00
Irfan Sheriff
21d07b954a
Update view on UI thread
...
Bug: 6970872
Change-Id: I05bec7cb8a8292de522cbfe11c0ecd5a79375014
2012-08-22 11:37:20 -07:00
The Android Automerger
783482f410
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-22 06:34:22 -07:00
Jeff Brown
3be5dbf7da
am 500421e6: am 395f5f70: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
...
* commit '500421e671de3853babec393a28569bf009e432d':
Add a flag to control auto-brightness adjustment.
2012-08-21 23:18:53 -07:00
Jeff Brown
500421e671
am 395f5f70: Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
...
* commit '395f5f700718aac811ea8216fdb60bdd08452553':
Add a flag to control auto-brightness adjustment.
2012-08-21 23:17:06 -07:00
Jeff Brown
395f5f7007
Merge "Add a flag to control auto-brightness adjustment." into jb-mr1-dev
2012-08-21 23:15:26 -07:00
Jeff Brown
9674b32324
Add a flag to control auto-brightness adjustment.
...
The feature is still disabled, it's just disabled using
a flag now.
Change-Id: I43ceaa5ab9b7252e3882c8b2d48c9844afb806c3
2012-08-21 21:13:48 -07:00
The Android Open Source Project
7e0bcb084d
am e696e534: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'e696e53483068dd6bd0aa0ccde42bc1a1b75d336':
2012-08-21 16:09:57 -07:00
The Android Open Source Project
e696e53483
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id59555adc024005fc53103e2006e987e72283811
2012-08-21 16:07:03 -07:00
Jean-Baptiste Queru
8f97db22a9
am 5d8378c0: am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '5d8378c0bad90a7088e38ccb0d537b5d1a5efcdd':
Settings: disable Lock SIM card till response is received
2012-08-21 14:36:55 -07:00
Jean-Baptiste Queru
5d8378c0ba
am 4641f4b5: am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '4641f4b53790ad1ff6c6c1c17951b6b200a3f07c':
Settings: disable Lock SIM card till response is received
2012-08-21 14:35:54 -07:00
Jean-Baptiste Queru
4641f4b537
am 997b1f74: am 578700af: Merge "Settings: disable Lock SIM card till response is received"
...
* commit '997b1f74c49314162635c5976fa369dfcd3385fb':
Settings: disable Lock SIM card till response is received
2012-08-21 14:34:56 -07:00
