Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,107 Commits 3 Branches 0 Tags
d7289efbade2a7226cd0c768230f8a1fa93ebe5b
Commit Graph

24107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Suchi Amalapurapu
d7289efbad am 2be883c4: am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 18:27:56 -07:00
Jaikumar Ganesh
2e096c232c am 13da084d: am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 18:27:50 -07:00
Suchi Amalapurapu
6211c5690c am 5f0e438b: am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 2010-05-18 18:27:28 -07:00
The Android Open Source Project
cae1bfd266 am 634e9a12: am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 18:27:18 -07:00
Dianne Hackborn
9b081a809a resolved conflicts for merge of 8b625a95 to master 
Change-Id: I03264c6aad2d87629f9154f5c390cb36ce08efba
 2010-05-18 18:21:07 -07:00
Jason Sams
db3be83ac6 Merge "Split ScriptC Lib into CL, GL, and basic." 2010-05-18 16:04:21 -07:00
Suchi Amalapurapu
2be883c4b1 am 4ec730ca: am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:57:54 -07:00
Jaikumar Ganesh
13da084da8 am c4bdb6d5: am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:56:09 -07:00
Suchi Amalapurapu
4ec730cabb am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken

* commit '7361b7410f2427022cc8917b00553dc26107cded':
  Uncomment a test that was marked as STOPSHIP
 2010-05-18 14:55:48 -07:00
Jaikumar Ganesh
c4bdb6d5a0 am ea6f6755: am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ea6f6755ce15133238938bd9626b69e5f655a49c' into kraken

* commit 'ea6f6755ce15133238938bd9626b69e5f655a49c':
  Removing STOPSHIP logs.
 2010-05-18 14:53:39 -07:00
Suchi Amalapurapu
7361b7410f am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp

* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
  Uncomment a test that was marked as STOPSHIP
 2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4a0823e548 Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ea6f6755ce am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp

* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
  Removing STOPSHIP logs.
 2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
ef95acebdc Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:48:05 -07:00
Suchi Amalapurapu
fb7bacf6ba Uncomment a test that was marked as STOPSHIP 
Add MediumTest tag

Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
 2010-05-18 14:39:20 -07:00
Jaikumar Ganesh
af21fa61c2 Removing STOPSHIP logs. 
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
 2010-05-18 14:36:48 -07:00
Jason Sams
536923df75 Split ScriptC Lib into CL, GL, and basic. 
Change-Id: Iadab35f2a967a1afd7a2fd13216d0a7acf4b6a50
 2010-05-18 13:35:45 -07:00
Suchi Amalapurapu
5f0e438ba6 am 3d802ef7: am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 2010-05-18 13:19:45 -07:00
Suchi Amalapurapu
3d802ef73b am aa4db173: am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 
Merge commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c' into kraken

* commit 'aa4db173a2465d74ea35cc7f736f6b2a5b01f72c':
  Fix 2641875
 2010-05-18 13:17:58 -07:00
Suchi Amalapurapu
aa4db173a2 am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp

* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
  Fix 2641875
 2010-05-18 13:16:13 -07:00
Mike Lockwood
ddaac246c2 Merge "MTP: More prototyping work:" 2010-05-18 13:15:15 -07:00
Mike Lockwood
d0782678df MTP: More prototyping work: 
New media scanner test program
Media scanner now cleans up after files that no longer exist
Separate database table for audio files
Extract metadata from audio files with libstagefright

Change-Id: I2bd0fe877836c741658e72fcfeb89c11be0d9b41
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-18 16:12:38 -04:00
The Android Open Source Project
634e9a12f4 am 54525412: am 3aecdb9d: merge from open-source master 2010-05-18 12:50:20 -07:00
The Android Open Source Project
54525412c2 am 3aecdb9d: merge from open-source master 
Merge commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf' into kraken

* commit '3aecdb9d7e92b1a91860600feefb5c0062b652cf':
  fix build
  Fix some typos and other cosmetic cleanups in telephony framework.
 2010-05-18 12:49:01 -07:00
The Android Open Source Project
3aecdb9d7e merge from open-source master 
Change-Id: Ib711450566694550d9cb9ba01c25599010d2e5e4
 2010-05-18 12:47:02 -07:00
Dianne Hackborn
8b625a952e am 51a0c90b: Merge "Add new API to take over a window\'s Surface." into kraken 2010-05-18 12:22:53 -07:00
Dianne Hackborn
51a0c90b42 Merge "Add new API to take over a window's Surface." into kraken 2010-05-18 12:21:26 -07:00
Jean-Baptiste Queru
e25863c909 fix build 
Change-Id: I86ee569ec81e6c690f7697237be7d94307014142
 2010-05-18 11:54:42 -07:00
Suchi Amalapurapu
9a212adcff Fix 2641875 
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.

Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
 2010-05-18 11:31:50 -07:00
The Android Open Source Project
0c8ecec8f1 am b4ab2204: am 143c3d32: am 5ccb8b8c: merge from open-source master 2010-05-18 11:21:36 -07:00
The Android Open Source Project
b4ab220446 am 143c3d32: am 5ccb8b8c: merge from open-source master 2010-05-18 11:19:29 -07:00
The Android Open Source Project
143c3d32f4 am 5ccb8b8c: merge from open-source master 
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken

* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
  Fix updating and deleting FDN entries with an empty alpha identifier.
  Abort FDN delete when number is empty (instead of name)
 2010-05-18 11:17:01 -07:00
The Android Open Source Project
5ccb8b8c4d merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00
Dianne Hackborn
dc8a7f69d7 Add new API to take over a window's Surface. 
Change-Id: Iad6245faadc95f19ea63c8e229a1c02e9188f69e
 2010-05-18 10:46:33 -07:00
Jean-Baptiste Queru
d87ed5a5c5 Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jake Hamby
9f36f51844 Fix updating and deleting FDN entries with an empty alpha identifier. 
- Fix AdnRecord.buildAdnString() to generate the correct record when alpha
identifier is empty. This allows the user to update an FDN entry to remove
the alpha identifier. Previously the entire entry would be deleted because
an empty record was generated here when the alpha identifier was empty,
rather than a record containing the phone number with an empty alpha tag.
Also, return null if the number or alpha tag are too long.

- Fix bug in IccProvider.delete() where efType was compared against local
FDN constant rather than IccConstants.EF_FDN. This would always return
false. Comparing with IccConstants.EF_FDN gives the intended behavior.

Change-Id: I0ea75d7e107c7318c9a48ae6e0a15845a718f4c0
 2010-05-18 10:26:21 -07:00
Jean-Baptiste Queru
27b2267c0d Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
f90fa1a04f am 75c1b73d: am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:28:28 -07:00
The Android Open Source Project
75c1b73d53 am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:26:27 -07:00
The Android Open Source Project
400907086a am 4547e528: merge from open-source master 
Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken

* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
  Removed Calls to deprecated APIs and unused Imports
 2010-05-18 09:21:28 -07:00
The Android Open Source Project
4547e5284e merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Jeff Hamilton
f6e9a082a2 Merge "Another try at fixing the docs build." 2010-05-18 09:14:36 -07:00
Scott Main
5ddfac4239 am 68cc7187: am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 2010-05-18 09:12:37 -07:00
Jeff Hamilton
7860b10d16 Another try at fixing the docs build. 
Change-Id: Ief60f4e71efee1d3bb4ee36e2f2a2fcaeb996284
 2010-05-18 11:11:57 -05:00
Scott Main
68cc718786 am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 2010-05-18 09:10:41 -07:00
Scott Main
8473259ddb am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca' into kraken

* commit '74e151c54c31cf7324771fcabc06e9fbfe1118ca':
  docs: fix markup error
 2010-05-18 09:07:39 -07:00
Scott Main
74e151c54c am 5f1d1002: Merge "docs: fix markup error" into froyo 
Merge commit '5f1d100298dfafbd996b6deff457e6d1de4008a0' into froyo-plus-aosp

* commit '5f1d100298dfafbd996b6deff457e6d1de4008a0':
  docs: fix markup error
 2010-05-18 09:02:09 -07:00
Scott Main
5f1d100298 Merge "docs: fix markup error" into froyo 2010-05-18 08:59:03 -07:00
Scott Main
e3b9f8b9b2 docs: fix markup error 
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
 2010-05-18 08:43:11 -07:00
Jeff Hamilton
e5c50c6211 Merge "Fix a broken docs link." 2010-05-18 08:35:36 -07:00