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

29321 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
d9c17cc117 merge from gingerbread 
Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
 2010-12-09 09:11:06 -08:00
Dianne Hackborn
e59e0309a1 Add more checks for bad values to protect from corrupt files. 
Change-Id: I5e282099e7c6fcc8756146fc7282eec31937af1f
 2010-12-09 07:49:05 -08:00
Kenny Root
63be7a732e Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService 
Be compatible with the old DownloadProvider behavior of being able to
operate on content URIs returned from .insert()

Bug: 3242328
Change-Id: Ibd2ed553c87ea694d4b09a8265c7131fae588719
 2010-12-09 07:48:55 -08:00
Wink Saville
0a5ae453e5 am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '7f7474ddd6170b68b8b58cc03b75df85c96f08f2':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:53:24 -08:00
Wink Saville
7f7474ddd6 Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 2010-12-08 21:37:38 -08:00
Anshul Jain
60bb9c9a81 frameworks/base/telephony: Release wakelock on RIL request send error 
Android telephony does not release the partial wakelock right away if
there is an error in sending the RIL request. The wake lock is released
only after EVENT_WAKE_LOCK_TIMEOUT occurs that prevents the phone to go
in power collpase. The change is to release the wake lock as soon as the
error in send is detected.

Also, change RIL#send not not send a request if there is no connection to
vendor RIL, as the request will always fail.

Change-Id: Ia39a4b9ac12f4064e301a65abfd26409d49babe1
 2010-12-08 10:25:41 -08:00
Wink Saville
a00d89e824 am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit '2b858caecb3c293c47b48eed12a55a49e3039874':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:18:14 -08:00
Wink Saville
2b858caecb Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00
Jean-Baptiste Queru
12902d687f resolved conflicts for merge of 78742e01 to stage-korg-master 
Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
 2010-12-07 12:51:49 -08:00
Jean-Baptiste Queru
78742e01f7 Merge "Strings for NI position request are moved to resources" 2010-12-07 12:01:25 -08:00
Jean-Baptiste Queru
1ee2394edd am 1d67fa5b: Merge "Changing connect and response timeout." 
* commit '1d67fa5b110a1df21e408d450394fb62d5dc9a1e':
  Changing connect and response timeout.
 2010-12-06 13:43:36 -08:00
Jean-Baptiste Queru
1d67fa5b11 Merge "Changing connect and response timeout." 2010-12-06 13:39:19 -08:00
Jean-Baptiste Queru
005dd44b75 am 864b1e00: Merge "NumberPicker: Set formatter local value to US." 
* commit '864b1e007dc741ec10c23cabc0271f97a5b8c598':
  NumberPicker: Set formatter local value to US.
 2010-12-06 11:03:11 -08:00
Jean-Baptiste Queru
864b1e007d Merge "NumberPicker: Set formatter local value to US." 2010-12-06 10:57:04 -08:00
Chen Libao
f04f7ae73b NumberPicker: Set formatter local value to US. 
As the Arabic language formatter would make number "1,2,3" to Arabic
language word means one,two,three, NumberPicker won't like to show
any thing other than numbers, add local settings to US, make the
number 1,2,3

Change-Id: If2d161ac4133f6c9c6e1ec284d6d2fbf01855fa0
 2010-12-06 10:32:53 +01:00
Henrik Baard
d39fd5a97c Changing connect and response timeout. 
In bad network conditions and where switches often occur between 2G and
3G the timeout of 20s is too short.

Setting this timeout to 60 seconds will improve functionality in bad conditions
while it will not affect functionality in good networks. This change also aligns
the timeouts with the timeouts used by the Browser (Connection.java).

Change-Id: I0fbe3cbfe734f8d55a41bfa5d8ab6b332a19f912
 2010-12-06 07:57:02 +01:00
Hakan Gustavsson
dea74b0285 Strings for NI position request are moved to resources 
The strings used by the framework for network initiated position
requests are now string resources that can be properly localized.

Change-Id: If1cba89adb1bfcb9c8fdb59b9c5aa1107b11279e
 2010-12-03 09:47:21 +01:00
Jean-Baptiste Queru
4a88013a4a resolved conflicts for merge of bf1439c5 to stage-korg-master 
Change-Id: Iab543a7ee449025f1df5d58afaa8f8fdd4809c99
 2010-12-02 15:16:53 -08:00
Jean-Baptiste Queru
bf1439c513 Merge "Preserve flags field of event passed to injectKeyEvent()" 2010-12-02 14:56:13 -08:00
Mike Playle
c6ded10dd1 Preserve flags field of event passed to injectKeyEvent() 
This patch allows users of WindowManagerService.injectKeyEvent() to
set flags on the key event being injected.

In particular this allows long presses (FLAG_LONG_PRESS) to be
injected into the window manager.
 2010-12-02 16:25:46 +00:00
Jean-Baptiste Queru
40eade14bb Merge from open-source master 
Change-Id: Ie25bbfbf12fa8902d9ba82cf2d4ed4c60d439e39
 2010-12-02 07:55:06 -08:00
Jean-Baptiste Queru
077bc4ac01 Merge from open-source master 
Change-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338
 2010-12-02 07:54:57 -08:00
Jean-Baptiste Queru
e1de3f390e Merge "Fix crash by "adb shell pm list permissions -f|-s"" 2010-12-01 09:47:14 -08:00
Jean-Baptiste Queru
6cbca10893 Merge "Fix HTTP redirect missing statuscode 303 and 307" 2010-12-01 08:25:12 -08:00
Ali Utku Selen
1c3274ca12 Fix crash by "adb shell pm list permissions -f|-s" 
pm command makes the assumption that every permission should
contain android:description and android:label attributes while
they are not mandatory. If a permission does not contain these
two attributes, we get "android.content.res.
Resources$NotFoundException: String resource ID #0x0"
followed by a NPE when using -f or -s options.

With the following change, users will get "null" in output for
respective fields.

Change-Id: I4e7f407592fa071abdab1d979775f46ec27dc9d2
 2010-11-30 16:22:56 +01:00
Per Osbäck
43df1334a8 Fix HTTP redirect missing statuscode 303 and 307 
Change-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c
 2010-11-29 15:59:12 +01:00
Trevor Johns
d3f19b86b0 am 210e9c4a: Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 
* commit '210e9c4a8b1fdbe9c409f9ce426907587430858a':
  Revert "Disabling AccessibilityService sample from build system."
 2010-11-24 16:23:47 -08:00
Trevor Johns
210e9c4a8b Merge "Revert "Disabling AccessibilityService sample from build system."" into gingerbread 2010-11-24 16:21:16 -08:00
Trevor Johns
e66593b47c Revert "Disabling AccessibilityService sample from build system." 
This re-enables the AccessibilityService sample.

This reverts commit ca9d51b15074163521b140dce431cc3a10cb56fe.
 2010-11-24 16:03:21 -08:00
Xia Wang
a23fff3351 am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 
* commit 'c1c04ad047d7ca2f13aa5c9883da7219df5bee57':
  Add Wi-Fi tests for static IP. DO NOT MERGE
 2010-11-24 13:29:56 -08:00
Xia Wang
c1c04ad047 Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread 2010-11-24 13:27:53 -08:00
Scott Main
9e3d14c4aa am 93116f8f: am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '93116f8fb171a3cf0e9b68b70e2b275a8b6a32f7':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:43:08 -08:00
Scott Main
93116f8fb1 am 3577f51d: docs: clarify <include> layout properties bug: 3227820 
* commit '3577f51d4bc236a11e283855337752a7b6897f8b':
  docs: clarify <include> layout properties bug: 3227820
 2010-11-24 12:39:42 -08:00
Scott Main
3577f51d4b docs: clarify <include> layout properties 
bug: 3227820

Change-Id: Id5130cd805ee2ea545a795019fb375ffd841727f
 2010-11-24 11:24:33 -08:00
Jean-Baptiste Queru
9df7f31359 am f0f6c54b: Merge "frameworks/base: Destroy the overlay even if there is an error" 
* commit 'f0f6c54b13831b11bd7a3bd7a01dc49b7505e56e':
  frameworks/base: Destroy the overlay even if there is an error
 2010-11-23 11:14:57 -08:00
Jean-Baptiste Queru
f0f6c54b13 Merge "frameworks/base: Destroy the overlay even if there is an error" 2010-11-23 11:02:09 -08:00
Gloria Wang
3e18dfab34 am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts" 
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
 2010-11-22 21:26:13 -08:00
Gloria Wang
24a90c2674 am d9334934: Merge "Update of DRM Framework." 
* commit 'd93349342a89a25c7a884e8543c6adc048c5f86d':
  Update of DRM Framework.
 2010-11-22 21:25:56 -08:00
Gloria Wang
4da48ec883 Merge "Notify the playback status to DRM agents before the playback starts" 2010-11-22 21:15:07 -08:00
Gloria Wang
d93349342a Merge "Update of DRM Framework." 2010-11-22 21:14:09 -08:00
Xia Wang
739d0aed02 Add Wi-Fi tests for static IP. DO NOT MERGE 
- Add support in parser to parse static IP settings
- Add test for static IP configuration

Change-Id: I37e11ceb0f34c87113d8281b4de09893506c29e7
 2010-11-22 19:10:01 -08:00
Jean-Baptiste Queru
8484e57f30 resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp 
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
 2010-11-22 16:32:34 -08:00
Jean-Baptiste Queru
e4ae7fc3eb Merge "Enabling cell broadcast (SMS-CB) support in the platform." 2010-11-22 15:59:04 -08:00
Xia Wang
6bdd69370f am 5df8c155: Merge "Add Wifi Tethering stress test" into gingerbread 
* commit '5df8c155872833647ac56951ab90bd26a9af9480':
  Add Wifi Tethering stress test
 2010-11-22 14:46:33 -08:00
Xia Wang
5df8c15587 Merge "Add Wifi Tethering stress test" into gingerbread 2010-11-22 14:44:49 -08:00
Naomi Luis
637e3fd523 frameworks/base: Destroy the overlay even if there is an error 
Allow the overlay object to be destroyed whenever the destroy is
invoked. Currently the destroy call returns if there is an error
encountered, which results in open data and control channels.

Change-Id: I1f2ef4ebb5fb1dcabf05ab50b5bbf6e5e240a63a
 2010-11-22 14:03:18 -08:00
Scott Main
4f3c40cc4d am 8fac7c2e: change sdk version variable to 2.3 (for docs) 
* commit '8fac7c2edc433b6c7d153caac238fef595133663':
  change sdk version variable to 2.3 (for docs)
 2010-11-22 13:55:55 -08:00
Jean-Baptiste Queru
c8454a851f am b2b0db2d: Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" 
* commit 'b2b0db2d5c89ae8824a4cb5d7944bae3a1dc8bf4':
  SearchDialog: Fix for NullpointerException while using Suggestions in Browser
 2010-11-22 13:44:56 -08:00
Jean-Baptiste Queru
b2b0db2d5c Merge "SearchDialog: Fix for NullpointerException while using Suggestions in Browser" 2010-11-22 13:40:29 -08:00
Scott Main
8fac7c2edc change sdk version variable to 2.3 (for docs) 
Change-Id: I76f5c69fab08913543c4f3d1ab000f7c4b6c9574
 2010-11-22 13:36:39 -08:00