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

29525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
af22f4f16d am 767926bb: Import revised translations. DO NOT MERGE 
* commit '767926bbe90358bc3857f4b78f54c8cdacfb8773':
  Import revised translations.  DO NOT MERGE
 2010-12-10 10:03:55 -08:00
Jean-Baptiste Queru
81266d9936 am a218e014: reconcile with open-source gingerbread 
* commit 'a218e01437c3c47c49ced7ab363bf98fe92cf1e3':
 2010-12-10 08:49:37 -08:00
Eric Fischer
767926bbe9 Import revised translations. DO NOT MERGE 
Bug 3272618

Change-Id: I165a5964e62e3d3df59c26cf6595898ea3f84996
 2010-12-09 16:54:24 -08:00
Wink Saville
a740413022 am d0ffef4b: am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit 'd0ffef4b43594e540cb867da18d4403b4f583622':
  Fix for phone app crash in Icc Card.
 2010-12-09 14:02:09 -08:00
Wink Saville
d0ffef4b43 am 19b23afa: Merge "Fix for phone app crash in Icc Card." 
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
 2010-12-09 13:58:26 -08:00
Wink Saville
19b23afadf Merge "Fix for phone app crash in Icc Card." 2010-12-09 13:50:28 -08:00
Jean-Baptiste Queru
1bec55bd24 am d9c17cc1: merge from gingerbread 
* commit 'd9c17cc1178bc09d30eead05bf5be7ec5a05cbe7':
  Add more checks for bad values to protect from corrupt files.
  Grant ACCESS_ALL_DOWNLOADS to DefaultContainerService
 2010-12-09 10:45:29 -08:00
Jean-Baptiste Queru
a218e01437 reconcile with open-source gingerbread 
Change-Id: I11029c58c7bcfa194dde5584ea1e3ba048fb817b
 2010-12-09 10:18:23 -08:00
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
cc41b92ed7 am 0a5ae453: am 7f7474dd: Merge "frameworks/base/telephony: Release wakelock on RIL request send error" 
* commit '0a5ae453e50144b31c7f544714feb5bbc7b77d18':
  frameworks/base/telephony: Release wakelock on RIL request send error
 2010-12-08 21:57:03 -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
Mathias Agopian
054ae78245 am e1752f41: Merge "fix [3258603] \'Quadrant\' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 
* commit 'e1752f41d34249c891564889b07963262b1bd8bf':
  fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo
 2010-12-08 16:20:23 -08:00
James Dong
c402def718 am 1f5b133a: Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 
* commit '1f5b133ae29090f1807be392874f6b7a5d92c6d4':
  When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again
 2010-12-08 16:20:16 -08:00
Mathias Agopian
e1752f41d3 Merge "fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo" into gingerbread 2010-12-08 16:17:02 -08:00
Mathias Agopian
a2c3b35587 am 74da537f: Merge "[317580] fix issue where the screen wouldn\'t be rotated properly in bypass mode" into gingerbread 
* commit '74da537f80ba36c1279c04fcb85d89fc38c246a6':
  [317580] fix issue where the screen wouldn't be rotated properly in bypass mode
 2010-12-08 16:15:08 -08:00
James Dong
1f5b133ae2 Merge "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again" into gingerbread 2010-12-08 16:14:27 -08:00
James Dong
da1b16ad41 When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again 
bug - 3264094

Change-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01
 2010-12-08 15:37:14 -08:00
Mathias Agopian
791982bad9 fix [3258603] 'Quadrant' benchmark crashes inside eglQueryContext on GB/Crespo 
eglQueryContext(..., EGL_CONFIG_ID, ...) is dereferencing an uninitialized pointer
due to a typo.

Change-Id: I100addf3150f19cb6dfbce9987fb5239dd240878
 2010-12-08 15:34:02 -08:00
Mathias Agopian
74da537f80 Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread 2010-12-08 15:08:33 -08:00
Brad Fitzpatrick
5f8524d446 am 36af7943: Fix malformed Javadoc. 
* commit '36af79434fb62c26238132eaeda2ec5e732f3c2f':
  Fix malformed Javadoc.
 2010-12-08 13:23:03 -08:00
Brad Fitzpatrick
36af79434f Fix malformed Javadoc. 
Change-Id: I5cfbd49272117defce5226da0f40a8392457a2e2
 2010-12-08 11:31:07 -08:00
Uma Maheswari Ramalingam
cc7605ce61 Fix for phone app crash in Icc Card. 
- Check for active phone in ICC handler before processing messages.

- Boundary check for gsm/cdma subscription app index
while retrieving the ICC Card App.

Change-Id: I3d54447e8d48e3482763e78eeb2a737a34cec321
 2010-12-08 10:33:24 -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
Nick Pelly
8abce7f56e am 40ddd4a6: Merge "Implemented getSize() to return max ndef size." into gingerbread 
* commit '40ddd4a64908c0cbe4970d2ba1703f74717620a8':
  Implemented getSize() to return max ndef size.
 2010-12-07 22:57:23 -08:00
Nick Pelly
40ddd4a649 Merge "Implemented getSize() to return max ndef size." into gingerbread 2010-12-07 22:55:21 -08:00
Martijn Coenen
6d9fc7e1ef Implemented getSize() to return max ndef size. 
Change-Id: Ia584e8cfa51a4eaef5f03dc436c78a67296c2cae
 2010-12-07 22:54:07 -08:00
Martijn Coenen
2f3ed7912e am 5289b91c: Implement ndef formatting. 
* commit '5289b91c885158094988a9a7b51b3139565eb639':
  Implement ndef formatting.
 2010-12-07 22:35:01 -08:00
Martijn Coenen
5289b91c88 Implement ndef formatting. 
Change-Id: I6e3e3abdc304bc14d7c93a413e42bf957963e288
 2010-12-07 22:30:39 -08:00
Wink Saville
d9c7fde961 am a00d89e8: am 2b858cae: Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 
* commit 'a00d89e824c523c51955176b61e50472828fd8b1':
  Telephony: Add support to read 3GPP2 sms from CSIM/RUIM
 2010-12-07 22:22:01 -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
Dianne Hackborn
c4b7088f19 am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 
* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.
 2010-12-07 22:07:40 -08:00
Dianne Hackborn
42a23783aa Merge "Add more checks for bad values to protect from corrupt files." into gingerbread 2010-12-07 22:04:38 -08:00
Dianne Hackborn
7b9c56fe0f Add more checks for bad values to protect from corrupt files. 
Change-Id: I4174c358c49b93e74920b00fcfd6c68659bf7d08
 2010-12-07 22:02:59 -08:00
Wink Saville
2b858caecb Merge "Telephony: Add support to read 3GPP2 sms from CSIM/RUIM" 2010-12-07 21:57:53 -08:00
Mathias Agopian
ee5a3aca57 [317580] fix issue where the screen wouldn't be rotated properly in bypass mode 
In some situations, the screen transformation would not be
applied while in bypass mode.

Change-Id: I3d6dd52e4c12b11aae97b54bf8e2322536eee37f
 2010-12-07 21:16:14 -08:00
Mathias Agopian
4e345ab7df am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbread 
* commit 'a2977c383d363e1e88a5b36230b1fa4c312807d2':
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)
 2010-12-07 14:22:56 -08:00
Mathias Agopian
a0f011ff49 am 05813b0e: Merge changes I244b5469,I32044e91 into gingerbread 
* commit '05813b0eb92cb1bc79607ee402f14ca1e4b43f6d':
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:20:14 -08:00
Mathias Agopian
48f42f8c3f am 4153bf3a: Merge "[3171580] don\'t automatically log GraphicBuffer allocation failures" into gingerbread 
* commit '4153bf3a259624a2f2dc497b77b225a1fb517abc':
  [3171580] don't automatically log GraphicBuffer allocation failures
 2010-12-07 14:20:09 -08:00
Mathias Agopian
a2977c383d Merge changes Ie03796ae,Ide3e980a into gingerbread 
* changes:
  [3171580] SurfaceFlinger Bypass mode. (DO NOT MERGE)
  [3171580] Add transform field to native buffers. (DO NOT MERGE)
 2010-12-07 14:18:56 -08:00
Mathias Agopian
05813b0eb9 Merge changes I244b5469,I32044e91 into gingerbread 
* changes:
  [3253328, 3171580] Treat GONE and INVISIBLE views the same when calculating transparent regions
  [3171580] Fix two typos related to fixed-size buffers
 2010-12-07 14:18:21 -08:00
Mathias Agopian
4153bf3a25 Merge "[3171580] don't automatically log GraphicBuffer allocation failures" into gingerbread 2010-12-07 14:17:47 -08:00
Jeff Hamilton
03dc51b1a0 am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread 
* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.
 2010-12-07 14:04:40 -08:00
Daniel Sandler
688ad19d95 am f340d082: Merge "More precise status bar battery icons." into gingerbread 
* commit 'f340d082b8488de6f131c1e5932cd3abc16b47c1':
  More precise status bar battery icons.
 2010-12-07 14:01:31 -08:00
Jeff Hamilton
0f74afbbf4 Merge "Remove Type X Tags from the top-level API." into gingerbread 2010-12-07 13:59:29 -08:00
Martijn Coenen
72df4ea830 Remove Type X Tags from the top-level API. 
Also added an extra to carry the ndef message, so we can have it in multiple
Ndef instances without doing an active read.

Change-Id: I2ecabc24732990c5c9979ee3a001a7fb13da21d9
 2010-12-07 13:51:47 -08:00
Jean-Baptiste Queru
ee27dd356e am 12902d68: resolved conflicts for merge of 78742e01 to stage-korg-master 
* commit '12902d687fa1bd4bff3c2dfc079c71eacb00eedd':
  Strings for NI position request are moved to resources
 2010-12-07 13:02:22 -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