Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,859 Commits 3 Branches 0 Tags
3cbef2cc21399f3729d4e0b96dccc58d594cac52
Commit Graph

10233 Commits

Author SHA1 Message Date
Robert Greenwalt
e7cce11edc am f9610b38: Merge "Make the DUN apn data secure." into froyo 
Merge commit 'f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp

* commit 'f9610b3842e030138c1dc327a3a467aaea02c227':
  Make the DUN apn data secure.
 2010-06-04 15:57:21 -07:00
Robert Greenwalt
77b32ddbbe Make the DUN apn data secure. 
Rather than come out of the user-modifiable APN DB, the DUN APN data will
come first from a built-in resource and then potentially overriden by a secure
setting (which is gservices upgradable).

Also made the "require-dun" setting secure-setting overridable.
bug:2736390

Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
 2010-06-04 11:13:34 -07:00
The Android Open Source Project
2d743fe2f3 merge from open-source master 
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
 2010-06-04 11:08:36 -07:00
Romain Guy
fb59fbf14e Merge "Add better error handling for savePicture and restorePicture" 2010-06-03 14:26:21 -07:00
The Android Open Source Project
ee7e6a78e2 merge from open-source master 
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
 2010-06-03 09:03:58 -07:00
The Android Open Source Project
1bd7597b8c merge from open-source master 
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
 2010-06-02 08:54:47 -07:00
The Android Open Source Project
c8763858cf merge from open-source master 
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
 2010-06-02 08:41:59 -07:00
John Eckerdal
dad86349be Add better error handling for savePicture and restorePicture 
If an Exception occurs when storing the file treat this as an error
and always fail to try to prevent corrupted pictures to be stored to
the file system.

Close files if they were opened, the caller might want to perform other
file operations on the file and if it is still open these may fail.

Change-Id: Ic68596b5c745bbe413096c22684c388e853a7643
 2010-06-02 10:59:46 +02:00
Kenny Root
e99c012503 Merge "Improved error-handling in Rfc822Tokenizer" 2010-06-01 22:56:39 -07:00
Dan Egnor
1f5e847350 am a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo 
Merge commit 'a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp

* commit 'a80331c4d75cb8a7122e31315bc1e2950131659c':
  Comment-only change to add documentation for FileObserver
 2010-06-01 14:28:46 -07:00
Christian Mehlmauer
ef367529f9 Replaced raw string arguments for Context.getSystemService() with final Context variables 
Change-Id: If5139a1526101292e5da557bfad3f4db80fb64a8
 2010-05-31 23:08:30 +02:00
Dan Egnor
3dc1c7f5e8 Comment-only change to add documentation for FileObserver 
Change-Id: Icd9bc65be020a23f78c8bcda78fc68e7d05c93b4
 2010-05-31 12:17:12 -07:00
Kenny Root
6cc137459a am 94f1751c: Merge "Fix typo in EastAsianWidth javadoc" into froyo 
Merge commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641' into froyo-plus-aosp

* commit '94f1751cb0c6ea4004ff86b3af89e06e00a66641':
  Fix typo in EastAsianWidth javadoc
 2010-05-27 12:35:25 -07:00
Kenny Root
94f1751cb0 Merge "Fix typo in EastAsianWidth javadoc" into froyo 2010-05-27 12:04:34 -07:00
Kenny Root
18b221af46 Fix typo in EastAsianWidth javadoc 
The Javadoc had a missing close <code> tag and also failed to mention
the "start" parameter in the doc.

Change-Id: I861d6646e82e1d49f23a09de8b68a61f81689f83
 2010-05-27 06:41:59 -07:00
Robert Greenwalt
88ccecf573 am d1055a25: Make the NTP Cache max-age gservices-settable 
Merge commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae' into froyo-plus-aosp

* commit 'd1055a250c00b0c2516ec406a8cf9a5ab1c0b7ae':
  Make the NTP Cache max-age gservices-settable
 2010-05-25 16:13:22 -07:00
Robert Greenwalt
d1055a250c Make the NTP Cache max-age gservices-settable 
Trying to make Throttle polling more energy efficient.

bug:2708119
Change-Id: I2b75639e202dcbcee11047c43407a22de04ce350
 2010-05-25 15:54:52 -07:00
Adam Powell
f67c874c07 am 7e5e3745: Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 
Merge commit '7e5e3745cf0103219a13071fbd488c3c01da85d9' into froyo-plus-aosp

* commit '7e5e3745cf0103219a13071fbd488c3c01da85d9':
  Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children.
 2010-05-24 16:23:53 -07:00
Adam Powell
7e5e3745cf Fix bug 2710825 - Prevent ExpandableListView from scrolling too far when expanding children. 
Change-Id: I21b37647c5ad16e4f57fdda433e3b3ee2c7c83ad
 2010-05-24 15:13:41 -07:00
Christian Mehlmauer
d6c1919779 Fix for issue 895 (missing android: prefix), Removed unused imports 
Change-Id: I5eeca1db7eb97251729dff728b4c482de4b14885
 2010-05-21 19:02:48 +02:00
Xia Wang
3716ea04d9 am 06906796: If the network SSID is a string, it should be enclosed in double quotation marks. 
Merge commit '069067963cf0117cfb4a1aef99b550b126d9ca92' into froyo-plus-aosp

* commit '069067963cf0117cfb4a1aef99b550b126d9ca92':
  If the network SSID is a string, it should be enclosed in double quotation marks.
 2010-05-20 10:56:13 -07:00
Xia Wang
069067963c If the network SSID is a string, it should be enclosed in double quotation marks. 
bug id: 2701058

Change-Id: I40e10ba096053710d4974b005d0d2e7c309ccffe
 2010-05-20 10:22:59 -07:00
The Android Open Source Project
ee1cdd0e60 merge from open-source master 
Change-Id: I1612bf92bf47eb88299ed0e627e6662b23adc35a
 2010-05-19 09:36:55 -07:00
The Android Open Source Project
2dc7c6c415 merge from open-source master 
Change-Id: I94b3aacb3478b1d9e0751c02bb301d5f9a2cf05c
 2010-05-19 09:20:22 -07:00
Romain Guy
bcb62f099a Merge "Don't allow invalid Uris to be added as observers." 2010-05-19 09:03:57 -07:00
The Android Open Source Project
faf9a78363 merge from open-source master 
Change-Id: I970684d917ea2024871b45abe532c52bb45673c6
 2010-05-19 08:39:13 -07:00
The Android Open Source Project
d6c0bb0f0f merge from open-source master 
Change-Id: I0598edad283a177a5ddcc30e20d2284503e6038e
 2010-05-19 08:28:32 -07:00
Anthony Newnam
f51266471c Don't allow invalid Uris to be added as observers. 
If a null segment is added, it will cause problems traversing the list
at a later point.

Change-Id: I5aa97b969cac7231e214168af7d3263b1c16f0a0
 2010-05-19 07:39:07 -05:00
Romain Guy
e02a63f012 Merge "Add and document .nomedia constant for MediaStore (Issue 6365)" 2010-05-19 00:03:34 -07:00
Romain Guy
7a029da6d6 Merge "Text disappears when selecting text in text editor." 2010-05-19 00:01:55 -07:00
Romain Guy
2b9a49a30d Merge "Removed Calls to deprecated APIs" 2010-05-19 00:01:02 -07:00
Suchi Amalapurapu
7361b7410f am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 
Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp

* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
  Uncomment a test that was marked as STOPSHIP
 2010-05-18 14:53:37 -07:00
Suchi Amalapurapu
4a0823e548 Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo 2010-05-18 14:51:55 -07:00
Jaikumar Ganesh
ea6f6755ce am ef95aceb: Merge "Removing STOPSHIP logs." into froyo 
Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp

* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
  Removing STOPSHIP logs.
 2010-05-18 14:51:40 -07:00
Jaikumar Ganesh
ef95acebdc Merge "Removing STOPSHIP logs." into froyo 2010-05-18 14:48:05 -07:00
Suchi Amalapurapu
fb7bacf6ba Uncomment a test that was marked as STOPSHIP 
Add MediumTest tag

Change-Id: I0699d168d7ec70c076f4713e0e405c0779a290c6
 2010-05-18 14:39:20 -07:00
Jaikumar Ganesh
af21fa61c2 Removing STOPSHIP logs. 
Bug: 2694602
Change-Id: Id56e1ddcf5ea76de32238cd6761f2caf053f1fa1
 2010-05-18 14:36:48 -07:00
Suchi Amalapurapu
aa4db173a2 am 9a212adc: Fix 2641875 Initialize the cache path only if the container exists. This did exist before but was somehow removed. Fix a known test failure as well. 
Merge commit '9a212adcffbc4b32d51f512889b33ba584647aa9' into froyo-plus-aosp

* commit '9a212adcffbc4b32d51f512889b33ba584647aa9':
  Fix 2641875
 2010-05-18 13:16:13 -07:00
Suchi Amalapurapu
9a212adcff Fix 2641875 
Initialize the cache path only if the container exists.
This did exist before but was somehow removed.
Fix a known test failure as well.

Change-Id: I63219369b0e7abca4919fbde2a04035a0fea9e35
 2010-05-18 11:31:50 -07:00
The Android Open Source Project
4547e5284e merge from open-source master 
Change-Id: I3607454a9257701855354c12ef1f36841c889aea
 2010-05-18 09:18:37 -07:00
Scott Main
74e151c54c 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
e3b9f8b9b2 docs: fix markup error 
Change-Id: I59a42f47483d76b6a3220b1d88e9d6bd96f83daf
 2010-05-18 08:43:11 -07:00
Scott Main
fbb285e67f 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
8b3cea01bf docs: revise webview description and add info for targeting screen densities 
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
 2010-05-17 17:48:30 -07:00
Karl Ostmo
8ce072d579 Add and document .nomedia constant for MediaStore (Issue 6365) 
Change-Id: Ic9c4a784187cd1264584992411916a5beeefd864
 2010-05-17 14:57:06 -07:00
Mike Lockwood
3e9e9696f1 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
Mike Lockwood
eb9cbb8fdd Resurrect flashlight support in obsolete IHardwareService Binder API. 
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.

Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-17 17:47:20 -04:00
Christian Mehlmauer
15d24708b1 Removed Calls to deprecated APIs and unused Imports 
Change-Id: Ib26783ca1d6c345cc91aa3ab5b9654f5316c78a0
 2010-05-17 21:27:27 +02:00
Christian Mehlmauer
746a95ab71 Removed Calls to deprecated APIs 
Change-Id: I3f9b6a8d3c8a050156a6cc7ea0eb9de33b82f79a
 2010-05-17 21:16:20 +02:00
Kenny Root
8ea405d196 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