Commit Graph

3305 Commits

Author SHA1 Message Date
Alex Klyubin
01dbfbf9c3 am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev
* commit 'efd88e2c468db2169ff9bb17f2b89c246756dcda':
  Permit deactivation of malformed Device Admins.
2013-06-06 15:26:49 -07:00
Alex Klyubin
60544e74b6 am 3dddd8cb: Ensure all active Device Admins are listed.
* commit '3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
  Ensure all active Device Admins are listed.
2013-06-06 15:26:48 -07:00
Alex Klyubin
efd88e2c46 Merge "Permit deactivation of malformed Device Admins." into jb-dev 2013-06-06 22:25:29 +00:00
Alex Klyubin
29de9d5153 Permit deactivation of malformed Device Admins.
Bug: 9074296
Change-Id: I4a3b2f972cb297b9f985a762219c8d67d8e3a425
2013-06-06 14:56:24 -07:00
Alex Klyubin
3dddd8cbff Ensure all active Device Admins are listed.
Bug: 9074296
(cherry picked from commit d14258e50e)

Conflicts:
	src/com/android/settings/DeviceAdminSettings.java

Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
  PackageManager.queryBroadcastReceivers invocation. The above
  flag was introduced in API Level 18.

Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
2013-06-06 14:08:34 -07:00
Dianne Hackborn
5f28c77bc6 am d6086125: Fix issue #9074296: Device Admins can activate in a way...
* commit 'd60861258169083f3174734af821fc8078ec5d2f':
  Fix issue #9074296: Device Admins can activate in a way...
2013-06-06 12:23:05 -07:00
Dianne Hackborn
d608612581 Fix issue #9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them

Don't allow device admins to directly launch the add UI if
they are malformed.

(cherry picked from commit 8274b67702)

Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
  in the PackageManager.queryBroadcastReceivers invocation. The above
  constant was introduced in API Level 18 only. DeviceAdminSettings
  class from which this fix was extracted is not passing in the above
  flag when it invokes queryBroadcastReceivers either.

Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
2013-06-05 15:48:20 -07:00
Elliott Hughes
78f5c4d537 am 76ddf411: Merge "Fix /proc/version parsing in Settings."
* commit '76ddf4113ab73acfd3d6172a8965bffec2e7c60f':
  Fix /proc/version parsing in Settings.
2012-09-10 19:02:47 -07:00
Elliott Hughes
d267d377fb Fix /proc/version parsing in Settings.
Change-Id: I4bde0e4935eaa4c27067062443a051976daa115d
2012-09-10 17:58:15 -07:00
Elliott Hughes
a76ba7bb30 am cfbc61de: Merge "Stop using getDSTSavings."
* commit 'cfbc61de3f94a620153ca83a790e4d1b03a9078e':
  Stop using getDSTSavings.
2012-09-06 16:38:37 -07:00
Elliott Hughes
680c8c8e43 resolved conflicts for merge of 33f86196 to stage-aosp-master
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
2012-09-06 16:09:04 -07:00
Elliott Hughes
6c7f55ee4b Stop using getDSTSavings.
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.

Bug: 6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
2012-09-06 15:42:09 -07:00
Elliott Hughes
82723df002 Stop hard-coding sample 12- and 24-hour times.
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
2012-09-06 14:49:35 -07:00
Wink Saville
c5fc623131 am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity"
* commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
  Fix memory leak in ApnSettings-activity
2012-08-28 12:13:59 -07:00
Wink Saville
2d6b52bd38 Merge "Fix memory leak in ApnSettings-activity" 2012-08-28 12:01:29 -07:00
Jean-Baptiste Queru
300457bad2 am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings."
* commit '38ce5194e89b83697466abe2994016507109ec54':
  Enable to delete a stored persistent group from p2p settings.
2012-08-28 11:10:06 -07:00
Jean-Baptiste Queru
38ce5194e8 Merge "Enable to delete a stored persistent group from p2p settings." 2012-08-28 10:46:59 -07:00
Yoshihiko Ikenaga
f3f14665a3 Enable to delete a stored persistent group from p2p settings.
Enable to delete a stored persistent group from p2p settings.
The multilingualization has NOT been done yet.

Change-Id: I84bd89343c9e3ce5e62b8b96dfce9d286675b145
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-08-28 15:16:38 +09: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
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
Jean-Baptiste Queru
997b1f74c4 am 578700af: Merge "Settings: disable Lock SIM card till response is received"
* commit '578700afb1f14c7b3a0ab8c7daa7a1e94628c1cb':
  Settings: disable Lock SIM card till response is received
2012-08-21 14:33:50 -07:00
Jeevaka Badrappan
48c0383125 Settings: disable Lock SIM card till response is received
Lock SIM card checkbox is enabled always which results in
allowing the user to change the state even before the
previous change has been completed successfully. Due to
this option, UI ends up in state where it can send
disable Lock SIM card twice resulting in operation
not allowed error from modem.

Change-Id: I0f4a344a8d76720e75accf3a763c3d0e940a0dca
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: 9954
2012-08-21 17:00:22 +08:00
Jake Hamby
0de311b495 am c46455ac: Merge "Enable "APN roaming protocol" for all platforms"
* commit 'c46455ac7a2ad988700f975bb07558c8580bbe8e':
  Enable "APN roaming protocol" for all platforms
2012-08-20 18:06:25 -07:00
Jake Hamby
c46455ac7a Merge "Enable "APN roaming protocol" for all platforms" 2012-08-20 17:27:36 -07:00
Jean-Baptiste Queru
71742eb132 am 0c869d69: Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."
* commit '0c869d694b59a55c8d53b57a12393b55530e798e':
  UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
2012-08-17 08:55:52 -07:00
Jean-Baptiste Queru
f4cc034e8c am d61c23b3: Merge "TetheringSetting: Keep Tethering checkbox unchecked until tethering up"
* commit 'd61c23b3c20e990c34edfa5b257f558d479218cf':
  TetheringSetting: Keep Tethering checkbox unchecked until tethering up
2012-08-17 08:55:51 -07:00
Jean-Baptiste Queru
0c869d694b Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected." 2012-08-17 08:51:18 -07:00
Jeevaka Badrappan
26ef2c3436 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-17 14:21:08 +08:00
Li Wenji
83397eab96 TetheringSetting: Keep Tethering checkbox unchecked until tethering up
When click Tethering, the checkbox will be checked and then unchecked,
and finally move to checked states. This causes confusing to end user,
we need to keep Tethering checkbox unchecked before tethering is really
up.

Change-Id: If2314b7dd1369e619dead45af38fd53c7e89c34e
Author: Li Wenji <wenji.li@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: 18281
2012-08-16 14:47:43 +08:00
Wu, Hao
b76be1f8d4 UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected.
Add accessory flag to track accessory status. Disable MTP/PTP button
when Usb is working in accessory mode.

Change-Id: I3edcd2a7eb281db3bb9d345429643b77a237812e
Author: Wu, Hao <hao.wu@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: 27200
2012-08-16 14:45:55 +08:00
Jean-Baptiste Queru
291389ed5c am 5dbc1f64: Merge "Fix use of holo drawables in a few more places"
* commit '5dbc1f6405c909d6b6ba2da03e5b5fe8b417d1ba':
  Fix use of holo drawables in a few more places
2012-08-14 08:39:24 -07:00
Björn Lundén
c8272b0752 Fix use of holo drawables in a few more places
Change-Id: Ie549ff14812da807729641fab1871fffe35f80b6
2012-08-14 01:25:21 +02:00
Jeff Sharkey
865a914fb5 am 42eb3fb2: Merge "Fix the issue the setting crashes after unmount SD card in landscape"
* commit '42eb3fb2584b61aa27a4f89dd06817162f69fb3c':
  Fix the issue the setting crashes after unmount SD card in landscape
2012-08-13 14:11:01 -07:00
Jeff Sharkey
677e2ff670 am d7db6baa: Merge "Don\'t direct to market if no markets installed"
* commit 'd7db6baac7e7d6742916cf1f80e9cbf832b1c64d':
  Don't direct to market if no markets installed
2012-08-13 14:11:00 -07:00
Jeff Sharkey
42eb3fb258 Merge "Fix the issue the setting crashes after unmount SD card in landscape" 2012-08-13 13:17:12 -07:00
Jeff Sharkey
d7db6baac7 Merge "Don't direct to market if no markets installed" 2012-08-13 13:14:08 -07:00
Jean-Baptiste Queru
6fb425e280 am eefa61ed: Merge "Settings: Use ICS alert drawable"
* commit 'eefa61ed2e8583f659e868f3057f195d7cb2bb11':
  Settings: Use ICS alert drawable
2012-08-13 12:02:26 -07:00
Jean-Baptiste Queru
eefa61ed2e Merge "Settings: Use ICS alert drawable" 2012-08-13 11:53:46 -07:00
Jack Wang
481582f4ec Fix memory leak in ApnSettings-activity
When destroying the activity, the HandlerThread isnt stopped. This
results in that the thread remains, and if you enter/exit the
activity multiple times, you will end up with multiple threads and
a small memory leak

Change-Id: I4779d2625e6002b55066dd034c84d743b9f80ef5
2012-08-13 15:25:04 +02:00
Chuanxiao Dong
66e7f0a393 Fix the issue the setting crashes after unmount SD card in landscape
When rotate the phone, mLastClickedMountToggle and mClickedMountPoint
would be destroied which made dialog access NULL pointer.

Change-Id: Ic96fce93828ca7a6f8749fad6a258eb47831e062
Author: Chuanxiao Dong <chuanxiao.dong@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: 26569
2012-08-10 10:49:45 +08:00
Li Gang
8218d3ba18 MTP/PTP: disable erasing/unmount operation for SD card while MTP/PTP is active
Check the USB connection status and MTP/PTP setting, if USB connected and MTP/PTP enabled,
disable the erasing and umount operation.
Judge SD card Mounting status and keep summary string.

Change-Id: Iff3e0f25b581bc462c88fff59eb93d765baaddd7
Author: Li Gang <gang.g.li@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: 47043
2012-08-10 10:20:48 +08:00
Tore Anderson
68b9a26543 Enable "APN roaming protocol" for all platforms
Allows users to change the protocol (the PDP context type) used when
roaming in the same way they already can for when they are in their home
network. This is required in order to make IPv6 and IPv4v6 data roaming
work correctly in 3GPP networks.

See also: http://code.google.com/p/android/issues/detail?id=32631

Change-Id: I052842122e5fe96a8779077f0ae9ff4bc83066c5
Signed-off-by: Tore Anderson <tore@fud.no>
2012-08-08 23:10:35 +02:00
Jean-Baptiste Queru
7526636406 am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '5d72b2726797374e402943182d8132045ed32d3a':
  Add support for SE Android to the Settings app.
2012-08-08 14:04:11 -07:00
Michael Jurka
3d43f9c8aa am ca511a81: Fix appwidget bind dialog
* commit 'ca511a8115962be7f598deb20aa47793db6d06f7':
  Fix appwidget bind dialog
2012-08-02 22:29:23 -07:00
Michael Jurka
ca511a8115 Fix appwidget bind dialog
Bug: 6926529
Change-Id: I19327a6346b6e7da61a49a983b3373058db21f12
2012-08-02 18:36:42 -07:00
Amith Yamasani
2d018a8b0d am 07841668: Merge "Move Google-apps specific location settings to a Google package" into jb-dev
* commit '078416689807e49c8b6750b9e3cc8a0e9ca3a2a1':
  Move Google-apps specific location settings to a Google package
2012-07-26 16:07:19 -07:00
Amith Yamasani
8442db24a1 Move Google-apps specific location settings to a Google package
Bug: 6882764

This removes the Google specific checkbox and adds a master toggle
for location providers which turns both providers on/off when
toggled.

Change-Id: I2a7af0953902bfd6f4b221725dc2d838bb3d0ce4
2012-07-26 14:28:07 -07:00
Xingrun Chen
fc2e1ac055 Don't direct to market if no markets installed
The search intent cannot be resolved if there aren't any
market apps installed, so it will cause Settings crashed by
the ActivityNotFound exception.

So we need to check if the market intent requst can be resolved.
Then determine to notify user to direct the accessibility services
to market to get TalkBack or not.

Change-Id: I0f0d7b54eb5215e1a886315bb6816704384f6c59
Signed-off-by: Roger Chen <cxr514033970@gmail.com>
2012-07-26 00:41:15 +08:00