ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
35,178 Commits 2 Branches 0 Tags 54 MiB
41bcc1e343
Commit Graph

35178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
41bcc1e343 Merge "Fix embedded spaces in tar stream EVEN HARDER" 2011-06-07 15:20:34 -07:00
Irfan Sheriff
cbc5f74295 Merge "Update walled garden detection logic" 2011-06-07 15:16:00 -07:00
Amith Yamasani
fa5ae9b6da Merge "Volume Panel sizing for phones." 2011-06-07 14:48:50 -07:00
Yu Shan Emily Lau
5e8db8ac37 Merge "Cleaned up the old test cases and test media files." 2011-06-07 13:40:04 -07:00
Daniel Sandler
771e725e10 Merge "Experimental compatibility mode UI." 2011-06-07 13:37:08 -07:00
Christopher Tate
9f7bcda136 Fix embedded spaces in tar stream EVEN HARDER 
Change-Id: I97ac586ff3541a05d73e1e53f680517c15e6c662
 2011-06-07 13:17:17 -07:00
Mike Lockwood
5212f30bbf Merge "StorageVolume: Add allowMassStorage flag" 2011-06-07 12:44:52 -07:00
Christopher Tate
f6c10aab07 Merge "Implement shared-storage full backup/restore" 2011-06-07 12:25:06 -07:00
Alon Albert
e460063e27 Merge "Add columns: Events.lastSynced: flag marking this as a duplicate of the lastSynced sate of the event Events.sync_data7: General purpose sync column (will be used for editUrl in Google Sync Adapter) Calendars.canPartiallyUpdate: Flag indicating sync adapter can perform partial updates." 2011-06-07 12:16:28 -07:00
Christopher Tate
72a404d102 Implement shared-storage full backup/restore 
Every available shared-storage volume is backed up, tagged with its
ordinal in the set of mounted shared volumes.  This is an approximation
of "internal + the external card".  This lets us restore things to the
same volume [or "equivalent" volume, in the case of a cross-model
restore] as they originated on.

Also fixed a bug in the handling of files/dirs with spaces in
their names.

Change-Id: I380019da8d0bb5b3699bd7c11eeff621a88e78c3
 2011-06-07 12:16:27 -07:00
Mike Lockwood
dcfc0443af Merge "Add comment for deprecation of Intent.ACTION_UMS_CONNECTED and ACTION_UMS_DISCONNECTED" 2011-06-07 11:25:27 -07:00
Mathias Agopian
38986ffd62 am cf3036eb: (-s ours) am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'cf3036ebef2929f84bc4e34ed1e9d96eefd6a5e7':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-07 11:15:01 -07:00
Mike Lockwood
5d56ce7c82 Merge "Deprecate Intent.ACTION_UMS_CONNECTED and Intent.ACTION_UMS_DISCONNECTED" 2011-06-07 11:02:58 -07:00
Wu-cheng Li
4fee337c36 Merge "Improve android.hardware.Camera.Area javadoc." 2011-06-07 04:05:35 -07:00
Xia Wang
3271492aa6 Merge "Add OpenGl benchmark tests: display images with different texture in each mesh." 2011-06-06 22:00:31 -07:00
Dianne Hackborn
33c88c8681 Merge "Add force-stop subcommand for 'am'." 2011-06-06 19:01:48 -07:00
Fabrice Di Meglio
7342be80f2 Merge "Rename Gravity BEFORE/AFTER to START/END" 2011-06-06 16:48:30 -07:00
Eric Fischer
6f201cc8b1 Merge "Import revised translations." 2011-06-06 16:22:35 -07:00
James Dong
7c580daacb Merge "Fix the comment for the location box @xyz" 2011-06-06 15:54:10 -07:00
Ben Komalo
19bf7ebe49 Merge "Makes SSLCertificateSocketFactory more flexible" 2011-06-06 15:50:10 -07:00
Mathias Agopian
8180456e9c am c1cbf452: am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit 'c1cbf4525b4d12b6cb7908072d36c8f6ca819f5b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:25:32 -07:00
Mathias Agopian
e667e0c73b am 24855c09: merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
* commit '24855c09173a6caaec7dcedd0c2d7ce15121d39b':
  merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)
 2011-06-06 15:21:44 -07:00
Mathias Agopian
f3d939c5e5 merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE) 
Fix a race that could cause GL commands to be executed from the wrong thread.
  RefBase subclasses can now decide how they want to be destroyed.
  Fix a race in SurfaceFlinger that could cause layers to be leaked forever.
  Fix a race-condtion in SurfaceFlinger that could lead to a crash.

initial cherry-pick:
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp

Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
 2011-06-06 15:14:25 -07:00
Fabrice Di Meglio
2b7b45f2aa Merge "Fix USE_TEXT_LAYOUT_CACHE define" 2011-06-06 14:14:36 -07:00
Martijn Coenen
2704115312 Merge "Connecting to a NFC technology may fail." 2011-06-06 13:46:47 -07:00
Jeff Brown
2ac75c1f4b Merge "Copy pointer assets for hdpi." 2011-06-06 13:14:13 -07:00
Nick Pelly
3734299b72 am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '92279c0fa1c15bd4afaf051bed90776fa64744c1':
 2011-06-06 12:57:32 -07:00
TK MUN
b8e736140b am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 12:57:24 -07:00
Eric Fischer
b0387cd209 am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
  Import revised translations.  DO NOT MERGE
 2011-06-06 12:57:14 -07:00
Jaikumar Ganesh
6f027fecc1 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server
 2011-06-06 12:56:55 -07:00
Jean-Baptiste Queru
ac953eef76 am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 12:56:29 -07:00
Marco Nelissen
4851d29b9b Merge "resolved conflicts for merge of b2fd84ad to master" 2011-06-06 12:33:40 -07:00
Marco Nelissen
8539ca29e6 resolved conflicts for merge of b2fd84ad to master 
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
 2011-06-06 12:30:40 -07:00
Nick Pelly
78c3bed118 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
82ce6dbd85 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
f89c33c4d1 am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
RoboErik
a6d8c10bd6 Merge "Cleanup of Calendar.java to prep for api" 2011-06-06 11:39:40 -07:00
Jaikumar Ganesh
63a89d789f am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
6b078036f6 am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
8f2bc7998d am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Alex Sakhartchouk
cb3915721d Merge "Unhiding render target code for renderscript" 2011-06-06 10:54:26 -07:00
Eric Fischer
2768505342 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
John Reck
5d50ae60e8 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00
Glenn Kasten
7194cca8dc Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Marco Nelissen
b3fc75d18f Merge "Add WebP Mime-Type support in Android Media File" 2011-06-06 08:21:07 -07:00
Shih-wei Liao
edc0bea898 Merge "Fix the false-alarm bug when we skip to the end, which should be OK." 2011-06-05 00:58:40 -07:00
Wink Saville
7eb346560b Merge "resolved conflict for merge of fc51aaec to master" 2011-06-04 08:19:00 -07:00
Daniel Sandler
0430c20973 Merge "Fix the status bar test app." 2011-06-04 07:38:08 -07:00
Wink Saville
cab3aeb6f1 resolved conflict for merge of fc51aaec to master 
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
 2011-06-04 07:31:35 -07:00