Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,697 Commits 3 Branches 0 Tags
73db44151f7580276f7aa4bbc70dcd92dfefa786
Commit Graph

8685 Commits

Author SHA1 Message Date
Daisuke Miyakawa
4ac671ad97 Add comments for vCard parser. 
Bug: 2576594
Change-Id: I3303a350bdea7b1b84bd1fb318d31ba5a229457d
 2010-04-09 14:53:24 +09:00
Jeff Brown
6883c1769f am 6c099149: am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '6c099149daff56ca04ab40a86950e7b61caf6505' into kraken

* commit '6c099149daff56ca04ab40a86950e7b61caf6505':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:50:42 -07:00
Jeff Brown
6c099149da am 37d2f5d1: Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 
Merge commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46' into froyo-plus-aosp

* commit '37d2f5d15b850830d65b1f68ebc95d5ba0612a46':
  Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission.
 2010-04-08 22:39:19 -07:00
Jeff Brown
37d2f5d15b Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo 2010-04-08 17:18:15 -07:00
Irfan Sheriff
d99540d7a2 am 750f3211: am c9b6851a: Throttling framework addins 
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken

* commit '750f32117b96a8af4fb03fae459a80f79a667fca':
  Throttling framework addins
 2010-04-08 17:05:06 -07:00
Irfan Sheriff
750f32117b am c9b6851a: Throttling framework addins 
Merge commit 'c9b6851af68bdc20c4903b16c344e9f116647219' into froyo-plus-aosp

* commit 'c9b6851af68bdc20c4903b16c344e9f116647219':
  Throttling framework addins
 2010-04-08 17:01:59 -07:00
Irfan Sheriff
c9b6851af6 Throttling framework addins 
Add ThrottleManager in getSystemService
Add API for URL fetch

Bug: 2576057
Change-Id: Icd25c8b91ea4beea15c74e8ad7292ab48c962253
 2010-04-08 16:53:32 -07:00
Jeff Brown
64010e8350 Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission. 
Change-Id: I4be691f20f650b412beb22b199a4cbef879b2668
 2010-04-08 16:52:18 -07:00
Dan Egnor
a8369d875d am 9a907e75: am a40b3a8d: am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:59:49 -07:00
Dan Egnor
a40b3a8d98 am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 
Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken

* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
  Change TrafficStats to a new JNI implementation.
 2010-04-08 14:53:06 -07:00
Dan Egnor
c1420832a8 am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo 
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp

* commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b':
  Change TrafficStats to a new JNI implementation.
 2010-04-08 14:48:50 -07:00
Dan Egnor
5945579e4e Merge "Change TrafficStats to a new JNI implementation." into froyo 2010-04-08 14:45:07 -07:00
Dan Egnor
7829f3d4b1 am c138fd3a: am a28a05f3: am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:28:29 -07:00
Dan Egnor
a28a05f31b am f1f00f5b: am 21248080: Merge "Missed these ones in the previous rename." into froyo 
Merge commit 'f1f00f5bddd6b222879166f4528055a30bed307e' into kraken

* commit 'f1f00f5bddd6b222879166f4528055a30bed307e':
  Missed these ones in the previous rename.
 2010-04-08 14:19:52 -07:00
Grace Kloba
923c53b993 am f1055bd5: am edcac52a: am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during 2010-04-08 14:19:38 -07:00
Dan Egnor
f1f00f5bdd am 21248080: Merge "Missed these ones in the previous rename." into froyo 
Merge commit '2124808060a1eb5ea396238b7b99d2ed266b0b53' into froyo-plus-aosp

* commit '2124808060a1eb5ea396238b7b99d2ed266b0b53':
  Missed these ones in the previous rename.
 2010-04-08 14:15:29 -07:00
Brad Fitzpatrick
3f73e4869f am 341d0a52: am 9c3554e9: am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 2010-04-08 14:14:46 -07:00
Grace Kloba
edcac52a4e am 642d1556: am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate ca 
Merge commit '642d1556f13ac13f07515309288214e532029c50' into kraken

* commit '642d1556f13ac13f07515309288214e532029c50':
  For performance reason, we choose to block the picture
 2010-04-08 14:12:58 -07:00
Dan Egnor
2124808060 Merge "Missed these ones in the previous rename." into froyo 2010-04-08 14:10:50 -07:00
Brad Fitzpatrick
9c3554e997 am 4183b514: am c62cdef4: Merge "Rename logtag for clarity." into froyo 
Merge commit '4183b514bb72d96e8ed925c14266a23067c02fe5' into kraken

* commit '4183b514bb72d96e8ed925c14266a23067c02fe5':
  Rename logtag for clarity.
 2010-04-08 14:08:56 -07:00
Brad Fitzpatrick
a8fbedbf5e Missed these ones in the previous rename. 
BUG=2581935

Change-Id: I12e7fc924d7164ab4a5ff7bd6ee52a10f7551ad4
 2010-04-08 14:08:54 -07:00
Grace Kloba
642d1556f1 am 3f73549b: Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don\'t block the live update during drag/fling, frame rate can drop by 30%. 
Merge commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6' into froyo-plus-aosp

* commit '3f73549bc8a776a417bd185b72d3636e7f4ba7b6':
  For performance reason, we choose to block the picture
 2010-04-08 14:08:35 -07:00
Grace Kloba
3f73549bc8 Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo 2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
4183b514bb am c62cdef4: Merge "Rename logtag for clarity." into froyo 
Merge commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72' into froyo-plus-aosp

* commit 'c62cdef4ec4d22893b184776a21e42e8ff2a7c72':
  Rename logtag for clarity.
 2010-04-08 14:04:43 -07:00
Robert Greenwalt
ac6ec41b67 resolved conflicts for merge of 4e33e9c1 to master 
Change-Id: I3a150497693009a4cf4300c8445a791c1e1eea3b
 2010-04-08 13:54:58 -07:00
Brad Fitzpatrick
228629e920 Rename logtag for clarity. 
BUG=2581935

Change-Id: I85f0b704435861acd5a406ce5ec084b60696580c
 2010-04-08 13:25:46 -07:00
Robert Greenwalt
6646cf7af9 am 6f72a313: am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '6f72a313a042fdf0a5345f83eda74c5970b7db05' into kraken

* commit '6f72a313a042fdf0a5345f83eda74c5970b7db05':
  Add service to monitor/control the flow of data.
 2010-04-08 12:49:38 -07:00
Robert Greenwalt
6f72a313a0 am 2b4b5738: Merge "Add service to monitor/control the flow of data." into froyo 
Merge commit '2b4b5738011f5ccb118ad15721fd757c85448966' into froyo-plus-aosp

* commit '2b4b5738011f5ccb118ad15721fd757c85448966':
  Add service to monitor/control the flow of data.
 2010-04-08 12:45:51 -07:00
Robert Greenwalt
2b4b573801 Merge "Add service to monitor/control the flow of data." into froyo 2010-04-08 12:42:09 -07:00
Robert Greenwalt
9e696c29f0 Add service to monitor/control the flow of data. 
bug:2576057
Change-Id: Ib343c7ee1d619c6978910d9ee597db195d5aa3b6
 2010-04-08 12:34:45 -07:00
The Android Open Source Project
a3f1f164c0 am 4a78a4fe: am 892debc6: am 65369424: merge from open-source master 2010-04-08 11:37:37 -07:00
The Android Open Source Project
892debc681 am 65369424: merge from open-source master 
Merge commit '65369424cbfbf165b4324bdcb6f138435462a196' into kraken

* commit '65369424cbfbf165b4324bdcb6f138435462a196':
  Add keycodes PageUp and PageDown
 2010-04-08 11:29:23 -07:00
The Android Open Source Project
65369424cb merge from open-source master 
Change-Id: I975030d9572463bc69245bcffa25c47d7acb2b51
 2010-04-08 11:27:55 -07:00
Jaikumar Ganesh
e6c5d1d8be am dd35ce8e: am 0dbec5f4: am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:19:07 -07:00
Jaikumar Ganesh
0dbec5f4b2 am 9e82d359: am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 
Merge commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761' into kraken

* commit '9e82d359bcc22d1acd2eae5d7d183168cdfbf761':
  Don't allow connection to profiles in TURNING_OFF state.
 2010-04-08 10:12:57 -07:00
Fred Quintana
08695a5c91 Merge "create a SyncManager WakeLock for each syncadapter accountType/authority pair so that it will be easy to tell via bugreport which sync adapter is holding the wake lock the most" 2010-04-08 10:12:43 -07:00
Jaikumar Ganesh
9e82d359bc am d1a95f97: Merge "Don\'t allow connection to profiles in TURNING_OFF state." into froyo 
Merge commit 'd1a95f975b03371a937da87735359c286a6de7f3' into froyo-plus-aosp

* commit 'd1a95f975b03371a937da87735359c286a6de7f3':
  Don't allow connection to profiles in TURNING_OFF state.
 2010-04-08 10:08:25 -07:00
Jaikumar Ganesh
d1a95f975b Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo 2010-04-08 10:01:50 -07:00
Dmitri Plotnikov
4464784b63 Merge "Add the hidden ACTION_GET_MULTIPLE_PHONES and EXTRA_PHONE_URIS: a. Add the ACTION_GET_MULTIPLE_PHONES which will launch the contacts with multiple picker mode, and user can selected the multiple phones in the list of phone numbers. b. Add the EXTRA_PHONE_URIS which works with ACTION_PICK_MULTIPLE to specify the phone numbers should be selected by default when it is used as input or store the list of selected phone numbers when returnning from the activity." 2010-04-08 09:41:39 -07:00
Andrei Popescu
55bd1f13df am 4d232164: am ec472da7: am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 2010-04-08 09:20:44 -07:00
Andrei Popescu
ec472da766 am 1531d211: am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 
Merge commit '1531d211249783bdfc3ded9323397f22a5f1fc34' into kraken

* commit '1531d211249783bdfc3ded9323397f22a5f1fc34':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
 2010-04-08 09:12:43 -07:00
Andrei Popescu
1531d21124 am 3fe36fe5: Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo 
Merge commit '3fe36fe589809b732db12054428166adb069f53b' into froyo-plus-aosp

* commit '3fe36fe589809b732db12054428166adb069f53b':
  Avoid calling proxy.playbackEnded() again in onCustomViewHidden().
 2010-04-08 09:10:09 -07:00
Andrei Popescu
31d2aa1e17 Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). 
It is now always called via the MediaPlayer.onCompletion() callback.

Fix b: 2533272

Change-Id: If86cf6b2ab355ddcd976cd6a2ad92ce071a1af33
 2010-04-08 15:19:22 +01:00
Bai Tao
fc7838b45c Add the hidden ACTION_GET_MULTIPLE_PHONES and EXTRA_PHONE_URIS: 
a. Add the ACTION_GET_MULTIPLE_PHONES which will launch the contacts with multiple picker mode, and user can selected the multiple phones in the list of phone numbers.
b. Add the EXTRA_PHONE_URIS which works with ACTION_PICK_MULTIPLE to specify the phone numbers should be selected by default when it is used as input or store the list of selected phone numbers when returnning from the activity.

Change-Id: Icacae0ab9fc0f5e90aa28796fac55528df5324d5
 2010-04-08 21:55:46 +08:00
Daisuke Miyakawa
58b50f86cd Refactor vCard parser so that its implementation detail would be hidden from users. 
Move the current implementation or 2.1 and 3.0 to VCardParserImpl_V21 and VCardParserImpl_V30.
- From the view of users, it is strange to make vCard 3.0 inherit vCard 2.1.
- Those two specifications still have similar implementation detail, so make implementation of vCard 3.0 inherits vCard 2.1 makes sense from technical view point.

Now VCardParser_V21 and VCardParser_V30 are independent class.

Remove strict mode in vCard 3.0, since strict parsing is not necessary from the view of actual use, and needs to extra effort to support it.

Bug: 2576738
Change-Id: I1d5cb6cffffb53337faa2dd7c519e7254e12da86
 2010-04-08 19:58:58 +09:00
Wu-cheng Li
e2642ea220 am 1479d202: am 249c902c: am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 2010-04-07 22:10:18 -07:00
Wu-cheng Li
249c902ca6 am 75a9cbae: am 3f4639a6: Update API and javadoc according to API review. 
Merge commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db' into kraken

* commit '75a9cbaea42d1e28957dd3ff59899b4c75ffd8db':
  Update API and javadoc according to API review.
 2010-04-07 22:01:54 -07:00
Wu-cheng Li
75a9cbaea4 am 3f4639a6: Update API and javadoc according to API review. 
Merge commit '3f4639a6611222ae1ae5493de49213250d292139' into froyo-plus-aosp

* commit '3f4639a6611222ae1ae5493de49213250d292139':
  Update API and javadoc according to API review.
 2010-04-07 21:58:21 -07:00
Suchi Amalapurapu
4baf4e6a74 am eb606ec9: am 3e543abb: am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 2010-04-07 21:40:29 -07:00
Suchi Amalapurapu
3e543abbc1 am a599469f: am c2461be6: Merge "Fix 2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo 
Merge commit 'a599469f9095532cac95a8e7600412f156b88f1c' into kraken

* commit 'a599469f9095532cac95a8e7600412f156b88f1c':
  Fix 2579461
 2010-04-07 21:32:30 -07:00