Commit Graph

29604 Commits

Author SHA1 Message Date
Marco Nelissen
7ffbcb2892 am ca5d99ac: Merge "Guarantee that all db related files are deleted together."
* commit 'ca5d99ac41f00c282b9101d9b84da0338f15798e':
  Guarantee that all db related files are deleted together.
2013-08-07 08:34:17 -07:00
Marco Nelissen
ca5d99ac41 Merge "Guarantee that all db related files are deleted together." 2013-08-07 15:30:51 +00:00
jangwon.lee
740c1dd97e Guarantee that all db related files are deleted together.
When deleting a db file, all db related files has to be deleted together
like journal, wal, shm etc.

Change-Id: I49d4581673d03fe669e9e0eaa2b50f7b9d3c34a4
Signed-off-by: jangwon.lee <jangwon.lee@lge.com>
2013-08-07 09:50:43 +09:00
Wink Saville
9fe49fc56e am 523db46f: Merge "Set subscription_mode in the database to a default value"
* commit '523db46f6981a40e12007dbbe629bbdc47f861ba':
  Set subscription_mode in the database to a default value
2013-08-05 17:20:13 -07:00
Wink Saville
523db46f69 Merge "Set subscription_mode in the database to a default value" 2013-08-06 00:10:03 +00:00
Dianne Hackborn
c8911ddd48 am 373a2f15: am 607b414d: Add new app ops method to reset all op modes.
* commit '373a2f15667956ff8a00ba59b42972b9c930af92':
  Add new app ops method to reset all op modes.
2013-08-02 19:32:13 -07:00
Dianne Hackborn
607b414d04 Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
2013-08-02 19:06:25 -07:00
Jean-Baptiste Queru
ae311f4c5f am 17548b3c: Revert "be more robust with handling unknown sensors"
* commit '17548b3c70fe4f29d33367a61300f5323f5efe99':
  Revert "be more robust with handling unknown sensors"
2013-08-02 17:42:02 -07:00
Jean-Baptiste Queru
d07347eddb am 83485dc9: Merge "be more robust with handling unknown sensors"
* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors
2013-08-02 17:41:59 -07:00
Elliott Hughes
710f3e2cc6 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:41:57 -07:00
Jean-Baptiste Queru
17548b3c70 Revert "be more robust with handling unknown sensors"
This reverts commit 80ba0a6bae.
2013-08-02 17:31:54 -07:00
Jean-Baptiste Queru
83485dc920 Merge "be more robust with handling unknown sensors" 2013-08-03 00:13:24 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
2013-08-02 13:49:41 -07:00
Naveen Kalla
b4d485c184 Set subscription_mode in the database to a default value
If ro.telephony.default_cdma_sub is set, use that to set the
default CDMA subscription source in the database. If that is not set
use the default preferred value defined in the source code.

Change-Id: I11fff596a5fe721c64f192c889672326517dc43d
2013-08-01 18:03:42 -07:00
Elliott Hughes
368d81fe18 am c67b2ed5: Merge changes I80eaecff,Ia2b4f79b
* commit 'c67b2ed50226c4758d0fc1434d39f6add6a0a533':
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.
2013-07-31 17:57:22 -07:00
Elliott Hughes
6d4b1e24ae Switch Process.myTid over to the libcore JNI too.
Change-Id: I80eaecff014fabf809f4be3c9ee8b26aa64bf0cf
2013-07-31 17:38:11 -07:00
Jeff Hao
406ec15647 Replace native Process getpid/getuid with calls to libcore equivalents.
The Process natives were getting called were getting called while
handling a jdwp packet before the vm had a chance to register them.

(cherry-pick of 5bce6a308fc8a3c1e449cf905b8b6e8ace4ef3e2.)

Change-Id: Ia2b4f79b11e427283a712b2d0c52948f394640bf
2013-07-31 17:19:23 -07:00
Dianne Hackborn
5b45f2366e am bd61ba5b: am a99cb5bc: (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
* commit 'bd61ba5b22f55a70615e128310d365c6175a0a4e':
  (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
2013-07-31 14:18:06 -07:00
Dianne Hackborn
a99cb5bc41 (DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
...when clipboard listener attached

We need to clear the calling identity before dispatching change
notifications.  Also make this more robust, so that in the face
of any failure we will clean up the broadcast state.

Integrated from master.

Change-Id: I05e1f76ffd486439535631fe4062dabe94bd2ccf
2013-07-31 13:48:39 -07:00
Jean-Baptiste Queru
46aae98b41 am f2d643cf: Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter."
* commit 'f2d643cfc7405c1f771cacab365a0a5d9b547f36':
  Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
2013-07-30 15:32:19 -07:00
Jean-Baptiste Queru
f2d643cfc7 Merge "Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter." 2013-07-30 22:24:15 +00:00
Wink Saville
9516ed4598 am cfc23ac6: Merge "Add support for MNC=00"
* commit 'cfc23ac688be9de1ecd2e659455ea1ebcceb63dc':
  Add support for MNC=00
2013-07-30 12:24:39 -07:00
Wink Saville
cfc23ac688 Merge "Add support for MNC=00" 2013-07-30 19:19:47 +00:00
Jean-Baptiste Queru
c2314cf5f4 am e700a36e: Merge "Update getCheckedItemPositions() documentation"
* commit 'e700a36e4041a921f880a7c3c5ec6ce96c955a92':
  Update getCheckedItemPositions() documentation
2013-07-30 09:22:51 -07:00
Jean-Baptiste Queru
e700a36e40 Merge "Update getCheckedItemPositions() documentation" 2013-07-30 16:16:38 +00:00
Mattias Petersson
1d766b5321 Add support for MNC=00
This adds support for operators with MNC (Mobile Network Code) zero
to add customized resources. For example, it makes it possible to
add a folder called "/res/values-mnc00/" in an application. This will
cause resources in that folder to be used when MNC is zero.
(There is a total of 14 countries that have an operator with MNC
zero.)

Without this fix, the resource framework gets confused, because MNC 0
is normally used when the MNC is undefined (not set).

Bug: 7170488
Change-Id: Icfd39fd0c739216e89446252ea0e7ceba6f002c6
2013-07-26 18:42:34 +00:00
Daniel Karlberg
8014cbffad Fixed a leaked partial wakelock in AbstractThreadedSyncAdapter.
This fix ensures that onFinished() is always called in a syncClient
even if the application lacks the READ_SYNC_SETTINGS permission.

Change-Id: I944717e71ceae06a665f8a3b1199b41d73e12da4
2013-07-26 18:19:48 +00:00
Chet Haase
d766d71a4c am d547bcec: Merge "Return the actual interpolator of the ViewPropertyAnimator"
* commit 'd547bcec5634f99195a2b12522b6977f61c40d55':
  Return the actual interpolator of the ViewPropertyAnimator
2013-07-25 14:52:31 -07:00
Chet Haase
d547bcec56 Merge "Return the actual interpolator of the ViewPropertyAnimator" 2013-07-25 21:46:49 +00:00
Elliott Hughes
a35ec14f78 am 03bd8324: Merge "Switch DateUtils.formatDateRange over to an icu4c-based implementation."
* commit '03bd832461d02675d5a4c6a9c072bed18e81781e':
  Switch DateUtils.formatDateRange over to an icu4c-based implementation.
2013-07-25 10:26:32 -07:00
Cyril Mottier
d40acfb89e Return the actual interpolator of the ViewPropertyAnimator
The implementation of getInterpolator() was always returning null
(probably a quick copy-paste from the default Animator implementation).
This patch fixes the problem by returning the interpolator set by
setInterpolator(TimeInterpolator) or the default one if none has been
set yet.

This patch also avoid creating multiple instances of ValueAnimator in 
order to retrieve some default values.

Change-Id: I8880f419f021a8b980fb32bebe927915fde19bf7
2013-07-25 10:08:29 +02:00
Elliott Hughes
6139e64cd6 Switch DateUtils.formatDateRange over to an icu4c-based implementation.
Bug: 7289514
Change-Id: Ia382f49aa23737bde91b7891d95545da084ec57c
2013-07-24 14:46:31 -07:00
Cyril Mottier
82ff241fd6 Update getCheckedItemPositions() documentation
getCheckedItemPositions()'s documentation previously mentioned the 
returned SparseBooleanArray was only containing checked item positions 
(i.e. get(int position) always returning true). In practice, this is 
wrong, because getCheckedItemPositions() returns mCheckStates which 
basically contains all key-value mappings that have been used. As a 
consequence if the item at position p is checked and unchecked, the 
returned SparseBooleanArray will contain a (p, false) mapping.

Another option could be to delete all keys having a false value.

Change-Id: I15f8fc2a1ba3f1501af126c272b827402cfd8b14
2013-07-23 13:58:33 +02:00
Robert Greenwalt
85b5e4c48f am b5bf655c: am e874bd35: Merge "Add gservices updater for carrier provisioning url" into jb-mr2-dev
* commit 'b5bf655cc6cc9128aec99958cce3b054348c9273':
  Add gservices updater for carrier provisioning url
2013-07-19 13:37:41 -07:00
Elliott Hughes
03a152d7e7 am 15cb526e: Merge "Fix import after okhttp update."
* commit '15cb526ece1420b1ae2061e20fd0982d82b41aae':
  Fix import after okhttp update.
2013-07-18 09:36:48 -07:00
Narayan Kamath
c0bb16673e Fix import after okhttp update.
OkResponseCache moved packages in change
62321.

Change-Id: I2c08c4586405e767d1931ebc5f185c7916850fa1
2013-07-18 13:42:50 +01:00
Robert Greenwalt
e182bfe398 Add gservices updater for carrier provisioning url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-17 14:05:33 -07:00
Adam Powell
42658ed518 am 30ad7203: Merge "Consider mScrollX when drawing the checkMarkDrawable"
* commit '30ad720304790b07112b87f973a7e6ed5e1e6ee5':
  Consider mScrollX when drawing the checkMarkDrawable
2013-07-16 17:06:36 -07:00
Adam Powell
30ad720304 Merge "Consider mScrollX when drawing the checkMarkDrawable" 2013-07-17 00:04:28 +00:00
Adam Powell
45130c62e1 am 1dc3b790: am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '1dc3b790df61aa95cb68da390045249c59049fcd':
  PreferenceActivity should not leave message in looper when destroyed
2013-07-12 15:11:41 -07:00
Adam Powell
1dc3b790df am 4b8cc94c: Merge "PreferenceActivity should not leave message in looper when destroyed"
* commit '4b8cc94cc67d760e724c56aee9301d1bcc2bbe89':
  PreferenceActivity should not leave message in looper when destroyed
2013-07-12 15:09:54 -07:00
Hiroaki Kuriyama
1ebf13ef20 PreferenceActivity should not leave message in looper when destroyed
When a PreferenceActivity is destroyed as soon as created,
there is a problematic case that messages for the activity are
sometimes left in the looper even after the activity is destroyed.
For example, by clearing user data of the selecting IME on
Settings apk, com.android.settings.Settings is re-launched
2 times successively. (Destory->Create->Destroy->Create)
Due to the left message, application crash can happen.
(NullPointerException at BackStackRecord.getBreadCrumbTitle())

Two cases have been found to observe this issue.
[Case 1]
 1,Launch IME in advance.
 2,Go to Settings >Apps > All and choose the IME package.
 3,Click "Clear data"
 4,Application crash occurs on com.android.settings.
[Case 2]
 1,Go to Settings > Language&input > Language.
 2,ListView dialog to choose language is shown.
 3,Rotate the tablet 180 degree so that 90 degree rotation occurs twice.
 4,Application crash occurs on com.android.settings.

Change-Id: I5ce36ea7a40ab7bc7737b7dca6641a4c3d77a480
2013-07-12 15:42:35 +09:00
Jeff Sharkey
df04f64434 am f8b69275: am 1f99a483: Recover from corrupt network stats.
* commit 'f8b692754f7739e11c8438ab59c0760194cfacc5':
  Recover from corrupt network stats.
2013-07-11 11:41:24 -07:00
Jeff Sharkey
1f99a483e4 Recover from corrupt network stats.
When encountering corrupt stats, throw as IOException to allow
recovery at a higher level.

Bug: 9794832
Change-Id: I38d000b3bd8a4c99389c40a87ee0699efb6e9049
2013-07-11 11:18:53 -07:00
Elliott Hughes
dff4ec87e7 am e16a21c6: resolved conflicts for merge of 4a59376d to stage-aosp-master
* commit 'e16a21c6b4f108813e5f5e00f30e0ff075de504c':
  Track libcore API change.
2013-07-09 15:28:51 -07:00
Elliott Hughes
e16a21c6b4 resolved conflicts for merge of 4a59376d to stage-aosp-master
Change-Id: I0e40180b46dc58781c218b8d382299dab73d49cc
2013-07-09 15:25:23 -07:00
Elliott Hughes
befd0b1bdf Track libcore API change.
Change-Id: Ib818a7f21325c5f918bf497033a90d76b25ec9e7
2013-07-09 14:46:18 -07:00
Jean-Baptiste Queru
9058a6c881 am 7e683ec6: am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit '7e683ec6a53b1581671ce72782e7b25a0ae705d0':
  FastScroller: Fix to use appropriate index
2013-07-08 14:43:01 -07:00
Jean-Baptiste Queru
7e683ec6a5 am fa42e774: Merge "FastScroller: Fix to use appropriate index"
* commit 'fa42e774bc48c3172023c8c49610baa469c19e39':
  FastScroller: Fix to use appropriate index
2013-07-08 14:28:45 -07:00