ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
15,853 Commits 2 Branches 0 Tags 54 MiB
b4528aa49b
Commit Graph

15853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
7e4881ecee 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
7074d8febb merge from open-source master 
Change-Id: Ib90da5365c873e542d79f036c32ec9b178cd8da0
 2010-05-18 11:08:12 -07:00
Jean-Baptiste Queru
9addb68e3b Merge "Fix some typos and other cosmetic cleanups in telephony framework." 2010-05-18 10:34:42 -07:00
Jean-Baptiste Queru
ff796e109f Merge "Abort FDN delete when number is empty (instead of name)" 2010-05-18 10:14:14 -07:00
The Android Open Source Project
a72c1e8e4d am 40090708: am 4547e528: merge from open-source master 2010-05-18 09:26:27 -07:00
The Android Open Source Project
b47eaa315d 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
645ab2efb0 merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Scott Main
372b12e2f4 am 8473259d: am 74e151c5: am 5f1d1002: Merge "docs: fix markup error" into froyo 2010-05-18 09:10:41 -07:00
Scott Main
0c17d01a9b 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
e16cbc55b1 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
86080540cb Merge "docs: fix markup error" into froyo 2010-05-18 08:59:03 -07:00
Mathias Agopian
c3263d230b am d633215b: Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:12:10 -07:00
Mathias Agopian
2e33500e61 Merge "add a few tests to SharedBufferStackTest" into kraken 2010-05-17 20:10:24 -07:00
Mathias Agopian
3fbd902c9e add a few tests to SharedBufferStackTest 
Change-Id: I1c46c07aa1483aee4d4ebd8745638a2c462cc1b3
 2010-05-17 20:08:22 -07:00
Mathias Agopian
5aa8cb3c8b am f75d738d: Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:59:44 -07:00
Mathias Agopian
da1feecfb0 Merge "improve SharedBufferStack test" into kraken 2010-05-17 18:57:46 -07:00
Mathias Agopian
38ae67a18c 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
cd45552c57 improve SharedBufferStack test 
Change-Id: I32683bfe0916918757280db89113595867acd5a7
 2010-05-17 18:56:10 -07:00
Mathias Agopian
c58a13b3ee 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
b5c4577b88 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
68575d05b8 am 626db910: Store the list of source directories for the SDK. 2010-05-17 18:29:09 -07:00
Scott Main
cc86cc88e9 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
d8f510a83a 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
573edfa591 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
0c9d6432d5 Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 17:59:37 -07:00
Dirk Dougherty
a586539a07 am 8dd8c90a: am b2fa79e3: am 6750bb7f: Doc change: add link to source.android.com 2010-05-17 17:43:08 -07:00
Dirk Dougherty
45fb120925 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
846ef80952 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
33e60a04c5 am 2b2529f2: Merge "fix some bugs in SharedBufferStack::resize" into kraken 2010-05-17 17:32:01 -07:00
Mathias Agopian
da404f0b37 Merge "fix some bugs in SharedBufferStack::resize" into kraken 2010-05-17 17:29:52 -07:00
Mathias Agopian
d6297f7d09 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
f10d97cfe9 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
f16bcca653 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
1769eecb4a 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
8abc809b57 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
Xia Wang
ee52930f88 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
fff95371d3 am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 2010-05-17 15:02:42 -07:00
Mike Lockwood
2ac44f9a8c 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
a309fb7ae7 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
0d1e1dcb2f 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
29eab9147a am 0b275423: am 8ea405d1: am cfa2de30: Import revised translations 2010-05-17 14:52:51 -07:00
The Android Open Source Project
a543a508dc am 453894d8: am 8382068e: merge from open-source master 2010-05-17 14:52:46 -07:00
Jean-Baptiste Queru
e8cde6f9ba am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken 2010-05-17 14:52:21 -07:00
Mathias Agopian
60300f6d3b 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
Mathias Agopian
04aed2149d fix a crasher in our EGL wrapper when attrib_list is NULL in eglChooseConfig 
the EGL specification states that this should be treated as though it was
an empty list terminated with EGL_NONE.

Change-Id: I294104370a86b5e5c34c7bcf15c5459eab464631
 2010-05-17 14:45:43 -07:00
Kenny Root
57e629f549 am 8ea405d1: am cfa2de30: Import revised translations 
Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken

* commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a':
  Import revised translations
 2010-05-17 13:53:44 -07:00
The Android Open Source Project
0b4c28498d am 8382068e: merge from open-source master 
Merge commit '8382068ef2d385183f090373f3b0c6026bd56a99' into kraken

* commit '8382068ef2d385183f090373f3b0c6026bd56a99':
  Updated RGB LED test cases
 2010-05-17 13:53:35 -07:00
Jean-Baptiste Queru
de0076c778 resolved conflicts for merge of f7fb5331 to kraken 
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
 2010-05-17 13:50:32 -07:00
Kenny Root
b118f139f4 am cfa2de30: Import revised translations 
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
 2010-05-17 11:37:35 -07:00
The Android Open Source Project
ba7718b979 merge from open-source master 
Change-Id: I139c349b80b2cecfbdc30bd697cba099740293d9
 2010-05-17 10:38:00 -07:00