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

9333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Wilson
b9b6b17d73 am 2d6c325e: API XML changes to accompany dalvik.system deprecation. 
Merge commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3' into eclair-plus-aosp

* commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3':
  API XML changes to accompany dalvik.system deprecation.
 2009-09-26 10:48:09 -07:00
Jesse Wilson
2d6c325e78 API XML changes to accompany dalvik.system deprecation. 
See https://android-git.corp.google.com/g/26570
 2009-09-26 09:09:10 -07:00
Jeff Sharkey
67e40117f7 am 05701839: Remove query parameters for delaying group updates. 
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp

* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
  Remove query parameters for delaying group updates.
 2009-09-26 05:35:15 -07:00
Jeff Sharkey
057018399c Remove query parameters for delaying group updates. 
Callers should instead use applyBatch(), which now delays
any visible updates until the transation finishes.  This
partially fixes http://b/2075275
 2009-09-26 02:14:43 -07:00
Dima Zavin
434462f0c9 am ed5ecdba: egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Merge commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a' into eclair-plus-aosp

* commit 'ed5ecdba36648973be3033a045e2ece8bf039e4a':
  egl: temporarily also include eglTerminate->eglInitialize hack for 8k
 2009-09-26 02:00:13 -07:00
Dima Zavin
ed5ecdba36 egl: temporarily also include eglTerminate->eglInitialize hack for 8k 
Change-Id: Id5c51e54e733b24e5d5d5de0dcca84ac53afd3a9
Signed-off-by: Dima Zavin <dima@android.com>
 2009-09-26 01:00:49 -07:00
Jason Sams
abd8c8ac93 am f075b4e7: Fix fountain crash. 
Merge commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4' into eclair-plus-aosp

* commit 'f075b4e713c4e10e4cea12c856fcf4aaab9c29d4':
  Fix fountain crash.
 2009-09-25 20:38:01 -07:00
Jason Sams
f075b4e713 Fix fountain crash. 2009-09-25 20:24:54 -07:00
Jeff Hamilton
3b5fa27552 am a6c402fb: Merge change 27212 into eclair 
Merge commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854' into eclair-plus-aosp

* commit 'a6c402fb0ec4298413e1d37c53f0524ea3325854':
  Fix the build.
 2009-09-25 20:04:25 -07:00
Jack Palevich
ee61acdc53 am 8b854e0d: Merge change 27211 into eclair 
Merge commit '8b854e0d59512004028f96a93016e614c7df478a' into eclair-plus-aosp

* commit '8b854e0d59512004028f96a93016e614c7df478a':
  Fix build.
 2009-09-25 20:04:20 -07:00
Android (Google) Code Review
a6c402fb0e Merge change 27212 into eclair 
* changes:
  Fix the build.
 2009-09-25 22:57:07 -04:00
Jeff Hamilton
a8370e3fdc Fix the build. 
Change-Id: Ie4b61f8e8dde864c4d99b8723cd5ff290a373279
 2009-09-25 21:56:25 -05:00
Android (Google) Code Review
8b854e0d59 Merge change 27211 into eclair 
* changes:
  Fix build.
 2009-09-25 22:55:31 -04:00
Jack Palevich
d7de5ffb30 Fix build. 2009-09-25 19:55:07 -07:00
Jack Palevich
b44d9e150a am 056ade1b: Merge change 27203 into eclair 
Merge commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283' into eclair-plus-aosp

* commit '056ade1ba976eed5f9b3139ee96b9eb3a26f6283':
  Tighten up sample code.
 2009-09-25 19:16:18 -07:00
Jack Palevich
a46c138ab3 am 07e0dce4: Merge change 27202 into eclair 
Merge commit '07e0dce441ea056710efd76d7df18b8833de772a' into eclair-plus-aosp

* commit '07e0dce441ea056710efd76d7df18b8833de772a':
  Check for failure to create EGL surfaces and contexts.
 2009-09-25 19:16:13 -07:00
Android (Google) Code Review
056ade1ba9 Merge change 27203 into eclair 
* changes:
  Tighten up sample code.
 2009-09-25 22:08:15 -04:00
Android (Google) Code Review
07e0dce441 Merge change 27202 into eclair 
* changes:
  Check for failure to create EGL surfaces and contexts.
 2009-09-25 22:07:59 -04:00
Jack Palevich
aa3b0bee51 Tighten up sample code. 
- Still fails to work; don't know why.
 2009-09-25 19:07:31 -07:00
Jack Palevich
2e26fc08aa Check for failure to create EGL surfaces and contexts. 2009-09-25 19:06:30 -07:00
Scott Main
dd9649931f am f80e7d9c: am 60d8b780: Merge change 27064 into donut 
Merge commit 'f80e7d9cca1730506599ded8e32064e86b51344f' into eclair-plus-aosp

* commit 'f80e7d9cca1730506599ded8e32064e86b51344f':
  docs only.
 2009-09-25 18:03:11 -07:00
Scott Main
f80e7d9cca am 60d8b780: Merge change 27064 into donut 
Merge commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b' into eclair

* commit '60d8b78041e7b520e1f42b6419f5ab9b5fc1851b':
  docs only.
 2009-09-25 17:58:05 -07:00
Robert Greenwalt
fc6cd59650 am a16ca5ec: Merge change 27141 into eclair 
Merge commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404' into eclair-plus-aosp

* commit 'a16ca5ec4ba936ed2731a74650b6882d0ffde404':
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 17:57:27 -07:00
Android (Google) Code Review
60d8b78041 Merge change 27064 into donut 
* changes:
  docs only. add information on provisional api level and fix some link titles
 2009-09-25 20:51:31 -04:00
Android (Google) Code Review
a16ca5ec4b Merge change 27141 into eclair 
* changes:
  Fix ConnectivityManager's handling of apn switch.
 2009-09-25 20:51:00 -04:00
Dianne Hackborn
e42ed5fb1b am 05eeeace: Merge change 27178 into eclair 
Merge commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45' into eclair-plus-aosp

* commit '05eeeacee6fc69d184cd4cc1146cf5d5ccdb6b45':
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 17:28:04 -07:00
Android (Google) Code Review
05eeeacee6 Merge change 27178 into eclair 
* changes:
  Fix issue #2136448: googleapps crashes while adding 2nd gmail account
 2009-09-25 20:19:59 -04:00
Dianne Hackborn
c1e605eff4 Fix issue #2136448: googleapps crashes while adding 2nd gmail account 
Change-Id: I1dc27959650643bf0c7fd0564719856d7b3efeb1
 2009-09-25 17:18:15 -07:00
Scott Main
16a6e86d36 docs only. 
add information on provisional api level
and fix some link titles

Change-Id: If208ff3fc4bb169049484311422f772334c0ef1b
 2009-09-25 17:04:04 -07:00
Jason Sams
5b2acbfcee am 0c103af3: Merge change 27171 into eclair 
Merge commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb' into eclair-plus-aosp

* commit '0c103af370f7f0ec59a51f43ec0f6bd51972d3cb':
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
 2009-09-25 16:56:51 -07:00
Android (Google) Code Review
0c103af370 Merge change 27171 into eclair 
* changes:
  Fix remaining object leaks.  Change FountainView to tear down the rsContext and recreate on rotation to test teardown.
 2009-09-25 19:52:41 -04:00
Jason Sams
a57e982785 Fix remaining object leaks. Change FountainView to tear down the rsContext and recreate on rotation to test teardown. 2009-09-25 16:50:36 -07:00
Yu Shan Emily Lau
20f8fcd9fe am 7756cbee: Merge change 27073 into eclair 
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp

* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
  Removed the device type checking
 2009-09-25 16:47:24 -07:00
Jack Palevich
b1d9ee6266 am 2a5eea30: Merge change 27168 into eclair 
Merge commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e' into eclair-plus-aosp

* commit '2a5eea308fffed23ab96bedcddaf5e4cc91cec9e':
  Use EGLUtils to simplify choosing a configuration.
 2009-09-25 16:47:19 -07:00
Jason Sams
b4da1161f4 am aafc7b54: Merge change 27169 into eclair 
Merge commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a' into eclair-plus-aosp

* commit 'aafc7b547c556da095777a7ed8aac71a68fa9b0a':
  Improved object lifecycle tracking and fix leaks.
 2009-09-25 16:47:09 -07:00
Robert Greenwalt
d1aca6aa73 Fix ConnectivityManager's handling of apn switch. 
It was clearing the interfacename when it was needed later in the process - the prevented us
from clearing the route to private dns servers and clearing the flag that this was set.
Consequently future uses would not set the private dns servers (since it thought they were already
set) and our lookups would fail.

bug: 2146929
 2009-09-25 16:43:20 -07:00
Android (Google) Code Review
7756cbeef4 Merge change 27073 into eclair 
* changes:
  Removed the device type checking
 2009-09-25 19:42:24 -04:00
Android (Google) Code Review
2a5eea308f Merge change 27168 into eclair 
* changes:
  Use EGLUtils to simplify choosing a configuration.
 2009-09-25 19:41:13 -04:00
Android (Google) Code Review
aafc7b547c Merge change 27169 into eclair 
* changes:
  Improved object lifecycle tracking and fix leaks.
 2009-09-25 19:38:40 -04:00
Jason Sams
61f08d6fa7 Improved object lifecycle tracking and fix leaks. 2009-09-25 16:37:33 -07:00
Neel Parekh
1f395a210a am 6ecacd40: Center name when no status. Also shows the status if exists (not actually hooked up yet though). 
Merge commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899' into eclair-plus-aosp

* commit '6ecacd40dd56d80d6b7b8454d8f4c04124c8d899':
  Center name when no status.
 2009-09-25 16:33:11 -07:00
Jack Palevich
66d2e25ae3 Use EGLUtils to simplify choosing a configuration. 
Doesn't actually select anything, possibly due to device driver errors.
 2009-09-25 16:25:19 -07:00
Neel Parekh
6ecacd40dd Center name when no status. 
Also shows the status if exists (not actually hooked up yet though).

Bug: 2138736
 2009-09-25 16:22:26 -07:00
Dianne Hackborn
7bae17c6de am 48c84052: Merge change 27162 into eclair 
Merge commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af' into eclair-plus-aosp

* commit '48c84052e25c1ac1cdb6c86ac2d231d40a7801af':
  Fix Activity.overridePendingTransition().
 2009-09-25 16:21:02 -07:00
Neel Parekh
9a9b97d3a9 am 35468254: Merge change 26720 into eclair 
Merge commit '3546825421cab5330583633ed854134c35d1c08d' into eclair-plus-aosp

* commit '3546825421cab5330583633ed854134c35d1c08d':
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 16:11:46 -07:00
Android (Google) Code Review
48c84052e2 Merge change 27162 into eclair 
* changes:
  Fix Activity.overridePendingTransition().
 2009-09-25 19:11:43 -04:00
Fred Quintana
abd4d965db am 6ecaff15: add a optional String to the key of notifications to allow users to scope them 
Merge commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544' into eclair-plus-aosp

* commit '6ecaff15836581336b1e8fad6ac42f3ff4a13544':
  add a optional String to the key of notifications to allow users
 2009-09-25 16:11:40 -07:00
Dianne Hackborn
8b571a817c Fix Activity.overridePendingTransition(). 
Change-Id: I4ce995bd58efbbedbe4d0d1e9e0d0f4a8e261843
 2009-09-25 16:09:43 -07:00
Android (Google) Code Review
3546825421 Merge change 26720 into eclair 
* changes:
  Allow us to set the contact uri without setting the fast track's uri
 2009-09-25 19:05:10 -04:00
Fred Quintana
6ecaff1583 add a optional String to the key of notifications to allow users 
to scope them
 2009-09-25 16:01:22 -07:00