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

40143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason parks
7eb3b08e14 am 282e1c4f: am 21f62b9e: Merge "Add a method enable encryption." into honeycomb 
* commit '282e1c4ffae2b94265fd9cc20f68669b3a6e2781':
  Add a method enable encryption.
 2011-01-13 07:47:47 -08:00
Jason parks
282e1c4ffa am 21f62b9e: Merge "Add a method enable encryption." into honeycomb 
* commit '21f62b9e461416ae61c8471f7199f104f8fe33de':
  Add a method enable encryption.
 2011-01-13 07:44:55 -08:00
Jason parks
02f9acbdb4 am da6f7dbf: am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb 
* commit 'da6f7dbf9f8bf90c84147dbc57b885b3ece03e81':
  Remove the APIs for the old encryption scheme.
 2011-01-13 07:44:36 -08:00
Jason parks
da6f7dbf9f am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb 
* commit 'ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
  Remove the APIs for the old encryption scheme.
 2011-01-13 07:42:55 -08:00
Jason parks
21f62b9e46 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
ca6777b23b Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Marco Nelissen
5c2a306148 am d6129b79: (-s ours) am f679ba7d: Cherrypick from GB. Do Not Merge. 
* commit 'd6129b793f237c7bf9671a041b62610080256cbf':
  Cherrypick from GB. Do Not Merge.
 2011-01-13 07:35:56 -08:00
Marco Nelissen
d6129b793f am f679ba7d: Cherrypick from GB. Do Not Merge. 
* commit 'f679ba7d944a403fbdc77926c44978ffd5161f2d':
  Cherrypick from GB. Do Not Merge.
 2011-01-13 07:31:53 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge. 
Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
 2011-01-13 07:17:20 -08:00
Ben Murdoch
8ab0ac3570 am 6d089b29: am 6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb 
* commit '6d089b297b96041e28661bddd6ff0c83a6094c82':
  Improve error handling (NPE in DRT2)
 2011-01-13 06:49:20 -08:00
Ben Murdoch
6d089b297b am 6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb 
* commit '6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
  Improve error handling (NPE in DRT2)
 2011-01-13 06:47:45 -08:00
Ben Murdoch
6b3dc7a29a Merge "Improve error handling (NPE in DRT2)" into honeycomb 2011-01-13 06:46:17 -08:00
Wink Saville
49167d749f am a8aa5fb4: am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 
* commit 'a8aa5fb4ad3b784034cd4972adf127f5e8f86b13':
  Initialize mOtaspMode to OTASP_UNKNOWN.
 2011-01-13 06:29:06 -08:00
Wink Saville
a8aa5fb4ad am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 
* commit '5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
  Initialize mOtaspMode to OTASP_UNKNOWN.
 2011-01-13 06:26:23 -08:00
Wink Saville
5bf6cc0126 Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Philippe Marti
84cc2dbb1d Improve error handling (NPE in DRT2) 
Bug: 3284126
Change-Id: I7f8c6259f2932d2b1a10a2f9612866786d425da9
 2011-01-13 14:16:20 +00:00
Shih-wei Liao
7eb295d2c2 am a8e09520: am 96100195: Fix the build. 
* commit 'a8e09520010ccc32b303c3028e37f34942e1e48c':
  Fix the build.
 2011-01-13 02:25:24 -08:00
Shih-wei Liao
a8e0952001 am 96100195: Fix the build. 
* commit '96100195f06d9be287f2577a41f498917b34f7ef':
  Fix the build.
 2011-01-13 02:23:21 -08:00
Shih-wei Liao
96100195f0 Fix the build. 
Change-Id: I36b523d877c5beadf0fce21b9f7534f0ffc23959
 2011-01-13 02:20:51 -08:00
Shih-wei Liao
e5455b737f am 5dfe6222: am 078717be: Merge "Disable on-device linking" into honeycomb 
* commit '5dfe6222d97d2403a892188eddf5560971d5270d':
  Disable on-device linking
 2011-01-13 02:09:57 -08:00
Shih-wei Liao
b80784f772 am 7e5dc299: am c758f1c6: Merge "Fix the build." into honeycomb 
* commit '7e5dc299f303d4cd3a2b93e56e751b5aa3490ea7':
  Fix the build.
 2011-01-13 02:09:53 -08:00
Shih-wei Liao
c2cfab1dba am faf88e2d: am f6dd9c53: Merge "On-device linking." into honeycomb 
* commit 'faf88e2d9d7af6bcc906e38a03da58df095d8419':
  On-device linking.
 2011-01-13 02:09:48 -08:00
Shih-wei Liao
5dfe6222d9 am 078717be: Merge "Disable on-device linking" into honeycomb 
* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
  Disable on-device linking
 2011-01-13 02:07:53 -08:00
Shih-wei Liao
7e5dc299f3 am c758f1c6: Merge "Fix the build." into honeycomb 
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
  Fix the build.
 2011-01-13 02:07:48 -08:00
Shih-wei Liao
6806ef69bd am 9b024b69: am 3ae5017b: Merge "convert2uchar3." into honeycomb 
* commit '9b024b693e089aa28acfe637eb4513425efa5766':
  convert2uchar3.
 2011-01-13 02:07:39 -08:00
Shih-wei Liao
faf88e2d9d am f6dd9c53: Merge "On-device linking." into honeycomb 
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.
 2011-01-13 02:07:39 -08:00
Shih-wei Liao
078717be07 Merge "Disable on-device linking" into honeycomb 2011-01-13 02:06:17 -08:00
Shih-wei Liao
0394d2495a Disable on-device linking 
Change-Id: I7c416c7c9714fae0722e61c4f0368fbdb7d808b3
 2011-01-13 02:05:34 -08:00
Shih-wei Liao
9b024b693e am 3ae5017b: Merge "convert2uchar3." into honeycomb 
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
  convert2uchar3.
 2011-01-13 02:05:32 -08:00
Shih-wei Liao
c758f1c6a3 Merge "Fix the build." into honeycomb 2011-01-13 02:04:10 -08:00
Shih-wei Liao
f6dd9c539c Merge "On-device linking." into honeycomb 2011-01-13 02:04:00 -08:00
Shih-wei Liao
3ae5017b1b Merge "convert2uchar3." into honeycomb 2011-01-13 02:03:51 -08:00
Shih-wei Liao
3a3dd2b37c Fix the build. 
Change-Id: I20ac8700bcc8ccb7905f82bbfea81d007f67a68e
 2011-01-13 02:03:00 -08:00
Svetoslav Ganov
bfc3ce78f4 Updating the WebView accessibility key bindings after discussion with the access-eng team 
Change-Id: I39a303864b94a8a11b6cded9b8bb23041ad91502
 2011-01-13 01:20:39 -08:00
Adam Powell
311239b101 am 1fc7c046: am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb 
* commit '1fc7c0462e0ffc4b036fb162094aa2c6c93ad078':
  Fix bugs 3077517 and 3309579 - ListView bugs
 2011-01-12 23:54:05 -08:00
Adam Powell
1fc7c0462e am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb 
* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
  Fix bugs 3077517 and 3309579 - ListView bugs
 2011-01-12 23:52:25 -08:00
Adam Powell
2ea9aaa245 Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb 2011-01-12 23:50:05 -08:00
Adam Powell
4032252c99 Fix bugs 3077517 and 3309579 - ListView bugs 
Fix smoothScrollPositionFromTop scrolling too far on reverse scrolls

Fix an invalid touch mode when smoothScrollBy attempts to scroll off
the end of a list
 2011-01-12 23:45:01 -08:00
Guang Zhu
25ee01b14a am fdc911f2: am 37f81344: Merge "change webkit test data path" into honeycomb 
* commit 'fdc911f237c263d7212695c23c66f8f7fb9156ff':
  change webkit test data path
 2011-01-12 23:33:39 -08:00
Guang Zhu
fdc911f237 am 37f81344: Merge "change webkit test data path" into honeycomb 
* commit '37f813443dbe51277c2d849eb2b53caa137d50f7':
  change webkit test data path
 2011-01-12 23:32:00 -08:00
Guang Zhu
37f813443d Merge "change webkit test data path" into honeycomb 2011-01-12 23:29:53 -08:00
Justin Ho
6628019cb2 am eff3acd7: am cd0331ab: Fixing broken dropdown asset in Honeycomb as well 
* commit 'eff3acd77e337213219017c4b55402214843a3b1':
  Fixing broken dropdown asset in Honeycomb as well
 2011-01-12 23:01:15 -08:00
Justin Ho
eff3acd77e am cd0331ab: Fixing broken dropdown asset in Honeycomb as well 
* commit 'cd0331abd7eb1e9efff3251caa008492fe5cad35':
  Fixing broken dropdown asset in Honeycomb as well
 2011-01-12 22:59:33 -08:00
Guang Zhu
7171622320 change webkit test data path 
path changed from "/sdcard/android/" to "/sdcard/webkit/". the
old path clashes with "/sdcard/Android/" and has some odd issues
under FUSE

Change-Id: I57102dca99612bdd7b4d1f196e43436cd1276281
 2011-01-12 22:57:41 -08:00
Justin Ho
cd0331abd7 Fixing broken dropdown asset in Honeycomb as well 
Change-Id: Ie5a89fbf38dbad8e768c5c7569bd2e9a872fb587
 2011-01-12 22:56:55 -08:00
Justin Ho
f104982699 Fixing broken dropdown asset 
Change-Id: Icbeae8f234a4d21251ed592f681b520c32fa502e
 2011-01-12 22:52:37 -08:00
Andy Stadler
328526c975 am 199ae7dc: am 7b0f8f08: API changes to support encryption in DPM 
* commit '199ae7dce11badac71c27b1d973e24387dd5f924':
  API changes to support encryption in DPM
 2011-01-12 21:18:48 -08:00
Andy Stadler
199ae7dce1 am 7b0f8f08: API changes to support encryption in DPM 
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
  API changes to support encryption in DPM
 2011-01-12 21:17:03 -08:00
Andy Stadler
7b0f8f08ac API changes to support encryption in DPM 
* New uses-policies value
* Definitions for storage domain and encryption status
* API to get and set encryption status
* Intent to launch encryption changes
* Both new calls bottom out in the DPM service and are suitable for
  a device that does not support encryption.

NOTE: Nobody should use ACTION_START_ENCRYPTION yet.  It needs a receiver
  to be built in Settings (different CL).

Change-Id: I2ae193bedbec59f6ba46c0ec7de12ecf321e5803
 2011-01-12 21:11:32 -08:00
Jaikumar Ganesh
b96164ca09 am f683a357: (-s ours) am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 
* commit 'f683a357ee74f1bdd14ebdbac83c10d472386d71':
  DO NOT MERGE: Remove auto connection on ACL connection.
 2011-01-12 20:51:16 -08:00