ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
26,494 Commits 2 Branches 0 Tags 54 MiB
0093da6b1e
Commit Graph

26494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Dong
0093da6b1e am 83fdc69e: (-s ours) Merge "Squash commits of the following patches, cherry-picked from other branch - do not merge." into gingerbread 
* commit '83fdc69ea0beb715dd45f0a4285cb5d780f8018a':
  Squash commits of the following patches, cherry-picked from other branch - do not merge.
 2011-01-27 08:12:36 -08:00
Jaikumar Ganesh
6c556df3d0 am a788a943: (-s ours) Merge "Do Not Merge: Expose insecure rfcomm Bluetooth API." into gingerbread 
* commit 'a788a9430956dabbc1387e5cccc15f9f41639c95':
  Do Not Merge: Expose insecure rfcomm Bluetooth API.
 2011-01-27 08:12:18 -08:00
Dianne Hackborn
f0ade1ddcb am 29c99aaa: Merge "Added check to make orientation calculations more robust" into gingerbread 
* commit '29c99aaaaed00c605fb6cd64de169fafad0e40ed':
  Added check to make orientation calculations more robust
 2011-01-27 08:11:51 -08:00
Dianne Hackborn
0cec0be279 am c058bf00: Merge "Make the Phone options dialog use current language" into gingerbread 
* commit 'c058bf0043290f098fb487ee33e0da13f00134f2':
  Make the Phone options dialog use current language
 2011-01-27 08:11:34 -08:00
Kenny Root
4eea09c604 am ea6bf362: (-s ours) Deep clone settings for system package update DO NOT MERGE 
* commit 'ea6bf3628140283df24f2652b686d083b0d31ed9':
  Deep clone settings for system package update DO NOT MERGE
 2011-01-26 21:55:56 -08:00
Eric Fischer
bb96437f0e am 5a40b8ef: (-s ours) Merge "Add date format and map center resources for new locales." into gingerbread 
* commit '5a40b8ef81034e00f886010c71dccd62b919028b':
  Add date format and map center resources for new locales.
 2011-01-26 21:44:48 -08:00
Jeff Hamilton
f7c2ff5724 resolved conflicts for merge of 52d3203e to honeycomb-merge 
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
 2011-01-26 23:26:16 -06:00
Wei-Ta Chen
c8c39a3cca am 61d9ffbf: (-s ours) Merge "Do not merge." into gingerbread 
* commit '61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
  Do not merge.
 2011-01-26 21:14:34 -08:00
Jeff Hamilton
3b2303e306 resolved conflicts for merge of 4330b146 to honeycomb-merge 
Change-Id: I625dcf6d248ea7f6515094eae689f6550b0d6d1a
 2011-01-26 23:09:13 -06:00
Nick Pelly
c97297a9fb am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread 
* commit 'a29bf14e1d2857debc632ce4304a1c72dded348c':
  New Intent defined for RF ON/OFF events
 2011-01-26 20:40:46 -08:00
Kenny Root
a0168b8244 am e8c04db7: (-s ours) Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread 
* commit 'e8c04db71e347396e9537ead7113ba9f46706e44':
  Add the {get,set}PackageObbPaths calls to API
 2011-01-26 20:40:17 -08:00
Jaikumar Ganesh
b141ac861a am c8f42fb6: (-s ours) Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread 
* commit 'c8f42fb69867f171c04013b1b1a8f7e897ae3685':
  DO NOT MERGE: Remove auto connection on ACL connection.
 2011-01-26 16:19:55 -08:00
Eric Laurent
a402c22804 am bec4abaa: Merge "Fix issue 3302649." into gingerbread 
* commit 'bec4abaa12bf6759f354b54119c5524cf9339e7b':
  Fix issue 3302649.
 2011-01-26 16:19:34 -08:00
Justin Ho
4657a8c315 am 7b667a0c: (-s ours) Merge "Updated flightmode assets" into gingerbread 
* commit '7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
  Updated flightmode assets
 2011-01-26 16:19:13 -08:00
Kenny Root
acd7a84507 am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread 
* commit '6688b6c31765242866fc276cea7fa241fc5b5e7b':
  Allow updated system apps to retain priority
 2011-01-26 13:04:03 -08:00
Andreas Huber
9da0a7d085 am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed. 
* commit '7c6153606cc963191362494c8cb5669749e84326':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
 2011-01-26 11:02:10 -08:00
Andreas Huber
516bfde6ef am 7e2f9cc8: (-s ours) DO NOT MERGE: Fix Matroska issues 
* commit '7e2f9cc81da788006790365ff11f06551fc1bc26':
  DO NOT MERGE: Fix Matroska issues
 2011-01-26 11:01:50 -08:00
Andreas Huber
60b2f20794 am e7fbfb6b: (-s ours) Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread 
* commit 'e7fbfb6b745f56eeb394785932451aa0f2aa07d9':
  DO NOT MERGE: Fix parsing of ntp= PLAY response.
 2011-01-26 11:01:14 -08:00
Kenny Root
f2e1dee894 am 91c459ec: Copy user info from PackageSetting as well 
* commit '91c459ec7dba6d56816ff5cbd92c627e0f718915':
  Copy user info from PackageSetting as well
 2011-01-26 11:00:20 -08:00
Chung-yih Wang
89c7c31d9d am 65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread 
* commit '65ba2c421c19fde04e6b294087a5a9c507964575':
  Add auth. username in SipProfile.
 2011-01-26 10:59:51 -08:00
Jeff Hamilton
a6010793eb resolved conflicts for merge of ca36d863 to honeycomb-merge 
Change-Id: Idb00dc86e265b2aaed8852912e1f9d8659fd2835
 2011-01-26 11:27:51 -06:00
Martijn Coenen
c5611411b8 am 25be5365: Implement canMakeReadonly(). 
* commit '25be53652167300183282d170a00a6df576523f5':
  Implement canMakeReadonly().
 2011-01-25 16:16:53 -08:00
James Dong
3ad3008cd1 am 13d1cb56: (-s ours) Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread 
* commit '13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
  Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
 2011-01-25 16:16:32 -08:00
Nick Pelly
976f8799b1 am 92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread 
* commit '92939376199a08fa0a3b01759579a4979c2a94a2':
  Remove attemptDeadServiceRecovery() from TagTechnology's.
 2011-01-25 16:16:05 -08:00
Nick Pelly
b93ad06145 resolved conflicts for merge of d64d711d to honeycomb-merge 
Change-Id: Ibe2c6d9f3d0070fb62f8385a9f49e605be37c885
 2011-01-25 16:13:17 -08:00
Dianne Hackborn
ac8b760151 am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread 
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
 2011-01-25 15:52:15 -08:00
Chris Tate
6eb3fc3ada am bbff7ed4: (-s ours) DO NOT MERGE : Ensure that the first post-restore backup pass is correct 
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct
 2011-01-25 15:51:54 -08:00
Chris Tate
03ae0c7c05 am 6ec91731: (-s ours) DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores 
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
  DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
 2011-01-25 15:51:30 -08:00
Dianne Hackborn
eac3793473 am 433863b1: Fix issue #3333958: Package Manager can sometimes mistakenly think... 
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
  Fix issue #3333958: Package Manager can sometimes mistakenly think...
 2011-01-25 15:51:08 -08:00
Dianne Hackborn
3c952113eb am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread 
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
 2011-01-25 15:50:44 -08:00
Scott Main
d650db32ac am 9b447d12: (-s ours) docs: catchup gingerbread to gingerbread-docs with misc changes 
* commit '9b447d122a2f0a4798f03749e9d93b9a58834fe3':
  docs: catchup gingerbread to gingerbread-docs with misc changes
 2011-01-25 15:45:58 -08:00
Scott Main
d34c0c981a am 3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard 
* commit '3d0f0108f9487512195c7344be2417c30a93c3fc':
  cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
 2011-01-25 15:36:41 -08:00
Scott Main
0778f7d418 am c5602aee: fix bug 3295540 
* commit 'c5602aeea3f4962dcb66d7a9e4a733259d5c12d5':
  fix bug 3295540
 2011-01-25 15:36:17 -08:00
Yu Shan Emily Lau
1460084987 am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '2af4e71dd47565d794ad48041a156871396a7dde':
  Fix the test application orientation. Bug# 3205196
 2011-01-25 15:21:41 -08:00
Gilles Debunne
213b0f7514 am 9ffb0a0d: (-s ours) Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread 
* commit '9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
  Ran fixPngMetaTags on all the core/res assets.
 2011-01-25 15:20:38 -08:00
Gilles Debunne
7832d65d38 am 97664784: (-s ours) Merge "Asset cleanup. DO NOT MERGE" into gingerbread 
* commit '976647841cc9e52c373679c930d06d81310ff289':
  Asset cleanup. DO NOT MERGE
 2011-01-25 14:58:31 -08:00
Marco Nelissen
5cc9435b07 am f13d4501: (-s ours) 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 
* commit 'f13d4501396aa1679004ad07d440f65ced3ecc2b':
  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
 2011-01-25 14:58:08 -08:00
Marco Nelissen
36852b113f am ba77a3f9: (-s ours) Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831 
* commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
  Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
 2011-01-25 12:51:41 -08:00
Nick Pelly
59b1ef13c3 am f54ad8da: Clean up transceive(). 
* commit 'f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
  Clean up transceive().
 2011-01-25 12:39:25 -08:00
Eric Fischer
ff2b6df293 am 06d19ef0: (-s ours) Merge "Import translations for additional languages." into gingerbread 
* commit '06d19ef0a0f29d9a0bec63097ec443815512e9b1':
  Import translations for additional languages.
 2011-01-25 12:39:03 -08:00
Jeff Hamilton
35d264eed9 resolved conflicts for merge of 0aea1836 to honeycomb-merge 
Change-Id: I5aa17ff6dc9037815c3ec3e6e4b18183aedbbdf2
 2011-01-25 14:35:55 -06:00
Dianne Hackborn
9113f0463b am 3ea5728e: Tweak level at which we reset battery stats to 90%. 
* commit '3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
  Tweak level at which we reset battery stats to 90%.
 2011-01-25 10:45:33 -08:00
Adam Powell
8ec254230e Merge "Fix bug 3237638 - make it easy to change a "refresh" AB button/icon into the indeterminate progress icon" into honeycomb 2011-01-24 14:23:36 -08:00
Andreas Huber
f22700aad0 Merge "Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder" into honeycomb 2011-01-24 13:57:11 -08:00
Eric Fischer
fb2c634139 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-01-24 13:46:28 -08:00
Andreas Huber
622ed4bf67 Merge "The .mkv parser lib leaves some tracks NULL if it doesn't support them." into honeycomb 2011-01-24 13:29:58 -08:00
Huahui Wu
ac74723924 Merge "A few small cleanning-ups." into honeycomb 2011-01-24 13:25:17 -08:00
Daniel Sandler
fb85e51e1c Merge "Vertically align SSID/PLMN on lockscreen." into honeycomb 2011-01-24 13:14:35 -08:00
Justin Ho
3050e3c0b8 Merge "Updated checkbox assets for legacy applications" into honeycomb 2011-01-24 12:55:29 -08:00
Andreas Huber
071e5d38da Merge "Make AwesomePlayer's reset process more verbose to track down ANRs (again)" into honeycomb 2011-01-24 10:45:59 -08:00