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

23189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Mathias Agopian
f98b752a20 am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:12:10 -07:00
Mathias Agopian
d633215b60 Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:10:24 -07:00
Mathias Agopian
35b1a93d19 add a few tests to SharedBufferStackTest 
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
 2010-05-17 20:08:22 -07:00
Mathias Agopian
fdc1f4a745 am f75d738d: Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:59:44 -07:00
Mathias Agopian
f75d738d8c Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:57:46 -07:00
Mathias Agopian
1e38101513 am 88bcc1c6: Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken 2010-05-17 18:57:01 -07:00
Mathias Agopian
662be102ee improve SharedBufferStack test 
Change-Id: I32683bfe0916918757280db89113595867acd5a7
 2010-05-17 18:56:10 -07:00
Mathias Agopian
88bcc1c643 Merge "fix a bug where queueBuffer() would fail after the SharedbufferStack is resized" into kraken 2010-05-17 18:55:47 -07:00
Mathias Agopian
be6c8fc4d5 fix a bug where queueBuffer() would fail after the SharedbufferStack is resized 
Change-Id: I12bf13a62018ce1349bab7be0b0cad7fad13fee8
 2010-05-17 18:54:19 -07:00
Joe Onorato
c4a9383d5a am 626db910: Store the list of source directories for the SDK. 2010-05-17 18:29:09 -07:00
Joe Onorato
626db9101e Store the list of source directories for the SDK. 
Change-Id: I3e8425c8eb7c808b60ec764ff81bcbb7aec9684c
 2010-05-17 18:25:58 -07:00
Scott Main
0583ac4c4f am 9719fe11: am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 18:06:40 -07:00
Scott Main
9719fe11a1 am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken

* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:04:07 -07:00
Scott Main
fbb285e67f am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp

* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:01:28 -07:00
Scott Main
e64256d610 Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 17:59:37 -07:00
Scott Main
8b3cea01bf docs: revise webview description and add info for targeting screen densities 
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
 2010-05-17 17:48:30 -07:00
Dirk Dougherty
e38a0e0896 am 8dd8c90a: am b2fa79e3: am 6750bb7f: Doc change: add link to source.android.com 2010-05-17 17:43:08 -07:00
Dirk Dougherty
8dd8c90a13 am b2fa79e3: am 6750bb7f: Doc change: add link to source.android.com 
Merge commit 'b2fa79e3723b448114181fef983deaae97b44161' into kraken

* commit 'b2fa79e3723b448114181fef983deaae97b44161':
  Doc change: add link to source.android.com
 2010-05-17 17:40:09 -07:00
Dirk Dougherty
b2fa79e372 am 6750bb7f: Doc change: add link to source.android.com 
Merge commit '6750bb7f838b15ef25544d7aa66b17119fcd7227' into froyo-plus-aosp

* commit '6750bb7f838b15ef25544d7aa66b17119fcd7227':
  Doc change: add link to source.android.com
 2010-05-17 17:37:28 -07:00
Mathias Agopian
d4a5ea29c1 am 2b2529f2: Merge "fix some bugs in SharedBufferStack::resize" into kraken 2010-05-17 17:32:01 -07:00
Mathias Agopian
2b2529f200 Merge "fix some bugs in SharedBufferStack::resize" into kraken 2010-05-17 17:29:52 -07:00
Mathias Agopian
cd30f4f849 fix some bugs in SharedBufferStack::resize 
added buffers should now be labeled properly.

Change-Id: I28aa753fbe89ab89134e7753575319478934c7fa
 2010-05-17 17:27:26 -07:00
Dirk Dougherty
1ca1b4a6b1 am a8ec4bb6: am 429e8e3a: am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard 2010-05-17 17:11:13 -07:00
Dirk Dougherty
6750bb7f83 Doc change: add link to source.android.com 
Change-Id: Ia15c621ddf9ab380d7d2dcf3d8c92d527e6a69f0
 2010-05-17 17:09:41 -07:00
Dirk Dougherty
a8ec4bb6ec am 429e8e3a: am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard 
Merge commit '429e8e3a7333a162de352b158c15c61a7ab65807' into kraken

* commit '429e8e3a7333a162de352b158c15c61a7ab65807':
  Doc change: cherry pick from eclair ->docs: add dashboard for screens
 2010-05-17 17:08:27 -07:00
Dirk Dougherty
429e8e3a73 am 6bb6348f: Doc change: cherry pick from eclair ->docs: add dashboard for screens update platform dashboard 
Merge commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e' into froyo-plus-aosp

* commit '6bb6348f2a542b05b9945f28566fb876cf6aee2e':
  Doc change: cherry pick from eclair ->docs: add dashboard for screens
 2010-05-17 17:04:48 -07:00
Xia Wang
8ee6aefedc am 58e49a50: Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken 2010-05-17 16:41:53 -07:00
Dirk Dougherty
6bb6348f2a Doc change: cherry pick from eclair ->docs: add dashboard for screens 
update platform dashboard

Conflicts:

	docs/html/resources/dashboard/platform-versions.jd

Change-Id: I6d812085c96eb61e4f6d6e76af714292fa0d38b1
 2010-05-17 16:30:29 -07:00
Xia Wang
58e49a5040 Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken 2010-05-17 16:26:32 -07:00
Mike Lockwood
0b6e30d2a9 am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 2010-05-17 15:02:42 -07:00
Mike Lockwood
c5859388bd am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken

* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:59:39 -07:00
Mike Lockwood
3e9e9696f1 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Mathias Agopian
df9556f318 am 23100fd1: Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken 2010-05-17 14:54:42 -07:00
Kenny Root
9c75fa72a3 am 0b275423: am 8ea405d1: am cfa2de30: Import revised translations 2010-05-17 14:52:51 -07:00
The Android Open Source Project
b3f26be7ed am 453894d8: am 8382068e: merge from open-source master 2010-05-17 14:52:46 -07:00
Jean-Baptiste Queru
5942ccf0d8 am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken 2010-05-17 14:52:21 -07:00
Mathias Agopian
23100fd1ec Merge "fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig" into kraken 2010-05-17 14:49:36 -07:00