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

4076 Commits

Author SHA1 Message Date
Mike Lockwood
4cda1e3e8b am 2d39374f: am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread 
Merge commit '2d39374f081031871a15c4532242afe9a8738f9f'

* commit '2d39374f081031871a15c4532242afe9a8738f9f':
  GPS: More HAL initialization cleanup
 2010-10-11 11:36:01 -07:00
Wink Saville
c2a4432507 am 83d97f46: am 96619f9f: Merge "Add some error-case logging." into gingerbread 
Merge commit '83d97f460412f117998f4d446fd65ca79761a294'

* commit '83d97f460412f117998f4d446fd65ca79761a294':
  Add some error-case logging.
 2010-10-11 10:49:47 -07:00
Mike Lockwood
72f23bb1a5 am 748b413e: am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread 
Merge commit '748b413e94c73b760c63a03126df2c4712a1ae05'

* commit '748b413e94c73b760c63a03126df2c4712a1ae05':
  GPS: Do not call sGpsInterface->init() multiple times
 2010-10-11 10:20:41 -07:00
Dianne Hackborn
cc60839643 am 681f327e: am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378'

* commit '681f327e839a40a4d55d3567af341b9e90f62378':
  Fix retaining of granted permissions when updating of system app.
 2010-10-10 19:13:09 -07:00
Dianne Hackborn
65bdf4e634 am c58e9bff: am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 
Merge commit 'c58e9bff10200daaad6d06d57745edcc33314325'

* commit 'c58e9bff10200daaad6d06d57745edcc33314325':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
 2010-10-10 19:11:51 -07:00
Mike Lockwood
ca936f1661 am 98e1f384: am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 
Merge commit '98e1f3840f06d3dfea987154da25d5351460d080'

* commit '98e1f3840f06d3dfea987154da25d5351460d080':
  Remove races in Geocoder/LocationProvider Proxy
 2010-10-10 17:15:06 -07:00
Dianne Hackborn
615e2fa175 am b77455ee: am 78d68836: Implement tracking of package install times. 
Merge commit 'b77455ee290691b036ac79236a93e57ff294ef0c'

* commit 'b77455ee290691b036ac79236a93e57ff294ef0c':
  Implement tracking of package install times.
 2010-10-10 14:20:34 -07:00
Kenny Root
5bc3addb45 am 0689b60b: am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread 
Merge commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124'

* commit '0689b60b8644d7c4c76e5cdf7e6ce5cc4c5be124':
  Symlink application lib directory when on SD card
 2010-10-10 14:19:52 -07:00
Mike Lockwood
2d39374f08 am 66e60604: Merge "GPS: More HAL initialization cleanup" into gingerbread 
Merge commit '66e606040a521b81033ff75025620436c050c82e' into gingerbread-plus-aosp

* commit '66e606040a521b81033ff75025620436c050c82e':
  GPS: More HAL initialization cleanup
 2010-10-10 13:16:22 -07:00
Mike Lockwood
66e606040a Merge "GPS: More HAL initialization cleanup" into gingerbread 2010-10-10 13:13:16 -07:00
Mike Lockwood
4270237def GPS: More HAL initialization cleanup 
BUG: 3082940

Change-Id: Idd584ab8fe4512aae0769ecd1274c55d6ea2e5e7
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2010-10-10 16:04:18 -04:00
Wink Saville
83d97f4604 am 96619f9f: Merge "Add some error-case logging." into gingerbread 
Merge commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696' into gingerbread-plus-aosp

* commit '96619f9f0653a5c7f407c52ab565b5ddf23ad696':
  Add some error-case logging.
 2010-10-10 12:47:18 -07:00
Robert Greenwalt
572172befb Add some error-case logging. 
Turning off all debug logging is a good thing, but it leaves us blind when errors come in.
bug:3075537

Change-Id: I8a4e7f2ce094574ec45cec268bdbc46449540c9f
 2010-10-10 11:26:41 -07:00
Kenny Root
7a2eff1fc7 am c0c2076e: am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166'

* commit 'c0c2076e9a4dfd3b30b988d4ddd78abf9ed83166':
  Eliminate MCS_GIVE_UP state
 2010-10-10 11:15:44 -07:00
Kenny Root
3aa837cc0f am c296f22e: am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit 'c296f22e713257271f95c2115df9e13d05d5687a'

* commit 'c296f22e713257271f95c2115df9e13d05d5687a':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-10 11:14:31 -07:00
Mike Lockwood
748b413e94 am 1c3ef787: Merge "GPS: Do not call sGpsInterface->init() multiple times" into gingerbread 
Merge commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5' into gingerbread-plus-aosp

* commit '1c3ef78782cb3461ef83e0c337d03b6f677c94e5':
  GPS: Do not call sGpsInterface->init() multiple times
 2010-10-09 17:20:56 -07:00
Mike Lockwood
b6e5fa895c GPS: Do not call sGpsInterface->init() multiple times 
Change-Id: I5f2b55959bd67864168690c1fe619e55edc18268
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-09 20:14:33 -04:00
Kenny Root
682d143dec am 6ed0cfd3: am 5919ac6b: OBB: track binder death observers 
Merge commit '6ed0cfd3e798e3014c9f1099631249463d25140c'

* commit '6ed0cfd3e798e3014c9f1099631249463d25140c':
  OBB: track binder death observers
 2010-10-08 17:58:15 -07:00
Kenny Root
06f89ca9b1 am 36455d03: am a3ee5c03: Merge "Add MountService tests and fix a bug it found" into gingerbread 
Merge commit '36455d03256024981b1bf21557722a010b5e092a'

* commit '36455d03256024981b1bf21557722a010b5e092a':
  Add MountService tests and fix a bug it found
 2010-10-08 17:57:55 -07:00
Dianne Hackborn
fa9921e4bc am e89bf502: am ef083ec0: Merge "Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider" into gingerbread 
Merge commit 'e89bf50261902bf263887923bf95595ec8eae069'

* commit 'e89bf50261902bf263887923bf95595ec8eae069':
  Work on issue #3062691: GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
 2010-10-08 17:57:35 -07:00
Jason Chen
39b4867d48 Revert "Merge "Allow notifications to not specify a contentIntent."" 
This reverts commit 8885321046622d6a8c0a4214af98dc27eecd48a0, reversing
changes made to 61b8aaadd742f0be708cd37971d2c9e822bf778a.
 2010-10-08 16:22:53 -07:00
Dianne Hackborn
681f327e83 am 62d8874e: Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 
Merge commit '62d8874eb74045b37140857ea3b31f198f0adffa' into gingerbread-plus-aosp

* commit '62d8874eb74045b37140857ea3b31f198f0adffa':
  Fix retaining of granted permissions when updating of system app.
 2010-10-08 15:24:30 -07:00
Dianne Hackborn
62d8874eb7 Merge "Fix retaining of granted permissions when updating of system app." into gingerbread 2010-10-08 15:21:49 -07:00
Joe Onorato
8885321046 Merge "Allow notifications to not specify a contentIntent." 2010-10-08 15:16:14 -07:00
Dianne Hackborn
c58e9bff10 am db56b9bd: Merge "Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock" into gingerbread 
Merge commit 'db56b9bd39e739474684987b83f386f50596aa5d' into gingerbread-plus-aosp

* commit 'db56b9bd39e739474684987b83f386f50596aa5d':
  Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock
 2010-10-08 15:12:55 -07:00
Dianne Hackborn
2fe979fc61 Fix retaining of granted permissions when updating of system app. 
Was broken when the app is using a shared user ID.

Change-Id: I088334f6540889969ee4367fa502807ce3f94f6a
 2010-10-08 15:07:17 -07:00
Joe Onorato
80a752c537 Allow notifications to not specify a contentIntent. 
If they don't, the click events will be passed through to the individual
views in the notification view, which may have their own PendingIntents
attached.

Previously, it was against the UX spec to allow this, but now we are
changing that and will have buttons in there.

Change-Id: Ie3b2e96c6a1c4449fa86ed571f3ad0f047320d31
 2010-10-08 17:57:18 -04:00
Dianne Hackborn
ecfd7f7d95 Maybe fix #3076572: phone process crashes in SipService, trying to get wifi lock 
WifiService needs to keep the calling identity cleared while
it is doing all of its internal work.

Change-Id: I2bd720e26efcf5ad5839693307d61e51f0658ace
 2010-10-08 14:28:02 -07:00
Mathias Agopian
118c8490da Merge "fix a bug where timeouts would only be handled when a message was delivered" 2010-10-08 13:46:07 -07:00
Mathias Agopian
fe0ed4575e Merge "Fix a null dereference" 2010-10-08 12:44:19 -07:00
Mike Lockwood
98e1f3840f am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 
Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy
 2010-10-08 11:20:33 -07:00
Mike Lockwood
aecab79b4e Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 2010-10-08 11:17:17 -07:00
Dianne Hackborn
a1b0d6966e resolved conflicts for merge of efa4f7f8 to master 
Change-Id: I00dff76594326a6f6e69515a9cba673602ed269d
 2010-10-08 11:09:38 -07:00
satok
0ff647b030 Add a cancel button to InputMethodPicker and InputMethodSubtypePicker 
Change-Id: Ia64b9716c18da5a541c7fc04a507541d2ab952da
 2010-10-08 13:49:28 +09:00
Dianne Hackborn
b77455ee29 am 78d68836: Implement tracking of package install times. 
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
 2010-10-07 20:13:24 -07:00
Mathias Agopian
ad8d48a6b6 fix a bug where timeouts would only be handled when a message was delivered 
Change-Id: Id3127b21c1a1a1afab32911a8edbb202360d7c9b
 2010-10-07 19:59:06 -07:00
satok
26b29d1b87 Merge "Show "more" button in the dialog of InputMethodSubtypePicker" 2010-10-07 19:48:43 -07:00
Dianne Hackborn
78d688369a Implement tracking of package install times. 
Provides information about the time at which the package was
first installed and the time it was last updated.

Change-Id: Icb43f77b5b669a1ce685e8913046b8be386b6175
 2010-10-07 18:48:22 -07:00
Kenny Root
0689b60b86 am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread 
Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp

* commit '54e01e0f980cfb78153d5481f7e67cef90416174':
  Symlink application lib directory when on SD card
 2010-10-07 17:41:05 -07:00
Kenny Root
6a6b007c77 Symlink application lib directory when on SD card 
This will help legacy games that use dlopen() to directly access the
/data/data/<app>/lib directory before the
ApplicationInfo.nativeLibraryDir was part of the API.

Change-Id: Ie9f3e7239b6334708b5d086ffafe66a507f6d9da
 2010-10-07 17:20:26 -07:00
Robert Greenwalt
df255c2283 Stop using unauthorized dns 
We were using somebody elses dns without permission - rude.  Switch to using
secondary google public dns.

bug:3045768
Change-Id: I042262bb96d3efed4c0265dc7ff6ac418e4d4f1e
 2010-10-07 15:32:08 -07:00
Mathias Agopian
3e1a18ac6d Fix a null dereference 
Change-Id: I3df446b90c1607782778749de7ba0f8c00698c33
 2010-10-07 14:57:04 -07:00
Kenny Root
c0c2076e9a am e0c5ae7b: Merge "Eliminate MCS_GIVE_UP state" into gingerbread 
Merge commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9' into gingerbread-plus-aosp

* commit 'e0c5ae7b55f1eb49b0aed94339bfb8e3cd8fefb9':
  Eliminate MCS_GIVE_UP state
 2010-10-07 14:01:55 -07:00
Kenny Root
c296f22e71 am 0145e36c: Revert "Only allow 8 OBBs to be mounted by a UID" 
Merge commit '0145e36cad1472acafb492b3f009ca6eba9593ea' into gingerbread-plus-aosp

* commit '0145e36cad1472acafb492b3f009ca6eba9593ea':
  Revert "Only allow 8 OBBs to be mounted by a UID"
 2010-10-07 14:01:23 -07:00
Eric Laurent
786c57150c am ce2e2184: am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into gingerbread 
Merge commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3'

* commit 'ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3':
  Fixed AudioFlinger not always pausing tracks
 2010-10-07 12:23:39 -07:00
Joe Onorato
2cddeb4b82 am 2c164747: am f7872780: Merge "PowerManagerService needs yet another flag..." into gingerbread 
Merge commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba'

* commit '2c164747d364c3e51964d03ecefc5752c7c0c6ba':
  PowerManagerService needs yet another flag...
 2010-10-07 12:22:03 -07:00
Kenny Root
c5610a4c13 am cfc80bd5: am 2c3360fe: Merge "Remove lingering system app native libs in /data" into gingerbread 
Merge commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70'

* commit 'cfc80bd5c1e4f0207357b288b1b7b8374a31ba70':
  Remove lingering system app native libs in /data
 2010-10-07 12:21:22 -07:00
Kenny Root
13297fddcb am f2cc2e52: am 8735c4cd: Merge "Get correct native library path on reinstall" into gingerbread 
Merge commit 'f2cc2e522177683145b2daa0de0ed898b865824d'

* commit 'f2cc2e522177683145b2daa0de0ed898b865824d':
  Get correct native library path on reinstall
 2010-10-07 12:20:25 -07:00
Mike Lockwood
058ad782e6 Merge "resolved conflicts for merge of 6327a9fe to master" 2010-10-07 10:57:08 -07:00
Mike Lockwood
22f41918fa resolved conflicts for merge of 6327a9fe to master 
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
 2010-10-07 13:55:25 -04:00