drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,999 Commits 1 Branch 0 Tags
Commit Graph

65999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
93ff709045 am 46deab0a: Merge "Clean up SQLiteDebug natives." 
* commit '46deab0a694e7e3c79980904706a4d09bbda001a':
  Clean up SQLiteDebug natives.
 2012-01-19 19:55:55 -08:00
Jeff Brown
ad979f3de8 am b815d0f8: Merge "Remove custom SQLITE_UNCLOSED error code." 
* commit 'b815d0f80ae58bc48008186d3919e7c6e51fb43e':
  Remove custom SQLITE_UNCLOSED error code.
 2012-01-19 19:55:52 -08:00
Jeff Brown
8592baa347 Merge "Don't need to link to libsqlite from media JNI library." 2012-01-19 19:54:16 -08:00
Jeff Brown
46deab0a69 Merge "Clean up SQLiteDebug natives." 2012-01-19 19:54:05 -08:00
Jeff Brown
b815d0f80a Merge "Remove custom SQLITE_UNCLOSED error code." 2012-01-19 19:53:38 -08:00
James Dong
4023d86a67 am 20c53cb3: Merge "Remove obsolete TODO comments" 
* commit '20c53cb3aa8489c11004ac718c0891273391ac8c':
  Remove obsolete TODO comments
 2012-01-19 18:55:06 -08:00
James Dong
20c53cb3aa Merge "Remove obsolete TODO comments" 2012-01-19 18:53:27 -08:00
Romain Guy
86fcb90f3b am 22d41843: Fix the build, for real 
* commit '22d418437e44587cb0fba4353515719453269189':
  Fix the build, for real
 2012-01-19 18:36:34 -08:00
Romain Guy
22d418437e Fix the build, for real 
Change-Id: I6263f7e5e3ae2f7efe045f8b464c0ed1b87fc793
 2012-01-19 18:33:25 -08:00
Romain Guy
dec35b81b7 am 90bd1873: Merge "Fix build" 
* commit '90bd18737a5ce16708003363683744cfd0480d83':
  Fix build
 2012-01-19 18:17:54 -08:00
Romain Guy
90bd18737a Merge "Fix build" 2012-01-19 18:16:11 -08:00
Romain Guy
65447287cb Fix build 
Change-Id: I0e0f6a613cdad3ec075da9b84e3532dd492f0162
 2012-01-19 18:15:24 -08:00
Jeff Brown
05bd7b5daf Don't need to link to libsqlite from media JNI library. 
Media JNI library doesn't actually use libsqlite.

Change-Id: If8017444d259779d459ef2da83119814e31454c2
 2012-01-19 18:13:19 -08:00
Jeff Brown
254fba8960 Clean up SQLiteDebug natives. 
In particular, ensure that the database is initialized.

Change-Id: Ifa69a9dfa9d008af79beadbd1a25e90d0d29e66c
 2012-01-19 18:13:18 -08:00
Romain Guy
3e77e8e59c am d2f0dcd1: Merge "Remove unused code" 
* commit 'd2f0dcd182fbc0423d206919e81f3845fb9b8155':
  Remove unused code
 2012-01-19 17:44:50 -08:00
Romain Guy
d2f0dcd182 Merge "Remove unused code" 2012-01-19 17:42:10 -08:00
Romain Guy
68fc1dfce0 Remove unused code 
Change-Id: Ife0a43f3cfe64a1e74401b10bf74d37cbeefb5af
 2012-01-19 17:41:39 -08:00
Romain Guy
4adbee3784 am bad12166: Merge "Deprecate unused APIs" 
* commit 'bad12166190a7e8087eb5db0ae8df9a4e5843fde':
  Deprecate unused APIs
 2012-01-19 17:37:10 -08:00
Gilles Debunne
92db51938f Make sure text selection always starts 
When text can indeed be selected, we should always initiate
a text selection on long press. When the WordIterator fails
(for instance if the text is entirely made of punctuation
characters, maybe also with foreign languages), we select
one character.

Change-Id: I842507f7cbaed9a924d3176ea8ed6586f3548366
 2012-01-19 17:36:45 -08:00
Romain Guy
bad1216619 Merge "Deprecate unused APIs" 2012-01-19 17:34:26 -08:00
Jean-Baptiste Queru
ee567e08d9 am c3c36b4f: am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit 'c3c36b4fe5863c8ac0ea5470be633e8fade9c483':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:28:34 -08:00
Jean-Baptiste Queru
45470559cd am 12b7da69: am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '12b7da69957ef894ce5134989e38479c64308ea1':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:28:30 -08:00
Jean-Baptiste Queru
db2b39300a am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'f3f650db96d40014a0203393c585c368b0dd7a9a':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:28:26 -08:00
Jean-Baptiste Queru
dde686e2bd am 08d3c6e5: am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '08d3c6e5ba5c3e5fcc386b07efa709325d45b9ff':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:28:22 -08:00
Jean-Baptiste Queru
a1e8739757 am 7ae84204: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit '7ae84204c14b4abff70fcc19c3c33de2591df34b':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:28:18 -08:00
Jean-Baptiste Queru
c3c36b4fe5 am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" 
* commit '9d25b82d280c2d979d500e7da4447148f32f820b':
  Rename LOG_ASSERT to ALOG_ASSERT
 2012-01-19 17:26:16 -08:00
Jean-Baptiste Queru
12b7da6995 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 
* commit '6df477be186233e36fc370c4d2db6c1ed928a740':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
 2012-01-19 17:26:12 -08:00
Jean-Baptiste Queru
f3f650db96 am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 
* commit 'a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
 2012-01-19 17:26:08 -08:00
Jean-Baptiste Queru
08d3c6e5ba am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 
* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
 2012-01-19 17:26:03 -08:00
Jean-Baptiste Queru
7ae84204c1 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
 2012-01-19 17:25:58 -08:00
Kazuhiro Ondo
32f4700172 Always show appropriate mobile service label. 
Fix for Carrier Verification case failure for not showing
"no internet connection" text on expanded status bar while
mobile data connection is not CONNECTED state.

Bug:5884774
Change-Id: I433d5de626b9b0cff20d192cb6aae214f3e014b3
 2012-01-19 20:25:26 -05:00
Jean-Baptiste Queru
d6b5584b67 am 97aa8ee8: Merge ee4618bc 
* commit '97aa8ee81198234aedffceaf71ad216b96323393':
  Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
 2012-01-19 17:20:58 -08:00
Jean-Baptiste Queru
97aa8ee811 Merge ee4618bc 
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
 2012-01-19 17:18:25 -08:00
Romain Guy
f9d9c065ed Deprecate unused APIs 
Change-Id: I0107e246b632dda96b8b025217936954f1f46283
 2012-01-19 17:16:38 -08:00
James Dong
e1103cfc78 Remove obsolete TODO comments 
Change-Id: Ie2353f11c4bbea5699cf9b824bb4b6aa113e3472
 2012-01-19 17:14:16 -08:00
Jean-Baptiste Queru
fd266b3682 am 36b48c30: am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit '36b48c30adf7236b00eccf87f3b5691359526540':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 17:02:27 -08:00
Jean-Baptiste Queru
36b48c30ad am c318bbb0: Merge "Rename (IF_)LOG() to (IF_)ALOG()" 
* commit 'c318bbb05e02a0080e129623ec8029d31be0d60e':
  Rename (IF_)LOG() to (IF_)ALOG()
 2012-01-19 16:59:41 -08:00
Jeff Brown
48a4789686 Remove custom SQLITE_UNCLOSED error code. 
This error code was introduced at some point to help track when
a database could not be closed because a statement was not finalized.
Now that the DB wrappers have been rewritten, it is technically no longer
poossible for this to happen, so we can remove this.

Change-Id: Ibbd55debbf390af436d6533aebff9726b1ff29e7
 2012-01-19 16:39:03 -08:00
The Android Automerger
a5530a828a merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:56 -08:00
Justin Ho
abc90a7b48 am 820b45c0: Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 
* commit '820b45c0a21980a43532b9fb9823f8aa08c64a15':
  DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"
 2012-01-19 15:44:53 -08:00
Justin Ho
820b45c0a2 Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1 2012-01-19 15:43:19 -08:00
Justin Ho
170997a519 DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited" 
This reverts commit 01b02a734d2988c22b00f5df6346ad03d8bf52b6.

Change-Id: I848c01fc44eb9a51ead1116b2647ed838ec1825f
 2012-01-19 15:41:33 -08:00
Jean-Baptiste Queru
9d25b82d28 Merge "Rename LOG_ASSERT to ALOG_ASSERT" 2012-01-19 14:47:35 -08:00
Jean-Baptiste Queru
6df477be18 Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" 2012-01-19 14:47:22 -08:00
Jean-Baptiste Queru
a826f9e2c4 Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" 2012-01-19 14:47:09 -08:00
Jean-Baptiste Queru
4f367f3387 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 2012-01-19 14:46:54 -08:00
Jean-Baptiste Queru
ba7f0d2a03 Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" 2012-01-19 14:46:40 -08:00
Jean-Baptiste Queru
ee4618bc4d Merge "Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)" 2012-01-19 14:46:24 -08:00
Steve Block
f68633da3c Rename LOG_ASSERT to ALOG_ASSERT 
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
 2012-01-19 14:45:08 -08:00
Steve Block
c6aacce371 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) 
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
 2012-01-19 14:45:03 -08:00