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

30085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chen
9cefc6482b Merge "Update current.xml to fix the build" 2010-09-02 00:45:45 -07:00
Adam Powell
8b95d26093 am 0358def7: (-s ours) am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 
Merge commit '0358def77633b6548da06985cb22955a7e85abac'

* commit '0358def77633b6548da06985cb22955a7e85abac':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
 2010-09-02 00:33:29 -07:00
Adam Powell
0358def776 am 79492a0d: Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp

* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
  DO NOT MERGE Overscroll continues; asset and behavior tweaks.
 2010-09-02 00:31:03 -07:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Jason Chen
90cb9d04fe Update current.xml to fix the build 
Change-Id: I85a01bced5a72a7a5298daec008a779c6239d305
 2010-09-02 00:26:15 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks. 
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
 2010-09-02 00:14:53 -07:00
Dianne Hackborn
a5034b5d80 am 75823339: am a1c69e08: Fix a small bug when granting permissions through activity results. 
Merge commit '75823339cd03e5b25b576cd7a2b5941254017c4a'

* commit '75823339cd03e5b25b576cd7a2b5941254017c4a':
  Fix a small bug when granting permissions through activity results.
 2010-09-01 23:20:18 -07:00
Dianne Hackborn
75823339cd am a1c69e08: Fix a small bug when granting permissions through activity results. 
Merge commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4' into gingerbread-plus-aosp

* commit 'a1c69e084b5242ad4e4a1ef2fe8d99ba259b5af4':
  Fix a small bug when granting permissions through activity results.
 2010-09-01 23:17:20 -07:00
Dianne Hackborn
8f5edc93b6 am 840f0fec: am d3efa392: Clean up some permissions. 
Merge commit '840f0fecd87357cadf4b2a0ae96d30b457f89729'

* commit '840f0fecd87357cadf4b2a0ae96d30b457f89729':
  Clean up some permissions.
 2010-09-01 22:55:04 -07:00
Dianne Hackborn
a1c69e084b Fix a small bug when granting permissions through activity results. 
Change-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174
 2010-09-01 22:55:02 -07:00
Dianne Hackborn
840f0fecd8 am d3efa392: Clean up some permissions. 
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp

* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
  Clean up some permissions.
 2010-09-01 22:51:35 -07:00
Jim Miller
0ed0221e9c Merge "Fix 2579224: Add a separate timeout for lockscreen vs display" 2010-09-01 21:41:51 -07:00
Joe Onorato
2de8a82643 Merge "Revert "Changed ConnectivityService#getServiceInstance so its a singleton."" 2010-09-01 21:23:37 -07:00
Dianne Hackborn
949498de66 am 14d56840: am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread 
Merge commit '14d56840eeec537c037bebaeaebf1b37f48d8dad'

* commit '14d56840eeec537c037bebaeaebf1b37f48d8dad':
  Improve messages when java process is starting.
 2010-09-01 21:21:42 -07:00
Dianne Hackborn
d3efa39244 Clean up some permissions. 
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.

Also deprecate the activity API to go in the foreground.  I didn't
realize that was released in the SDK.  It needs to go away.

Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
 2010-09-01 21:19:40 -07:00
Dianne Hackborn
14d56840ee am bc5ec2f9: Merge "Improve messages when java process is starting." into gingerbread 
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp

* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
  Improve messages when java process is starting.
 2010-09-01 21:18:31 -07:00
Joe Onorato
00092874b1 Revert "Changed ConnectivityService#getServiceInstance so its a singleton." 
This reverts commit 28961cc02f350ccd1770fb5af2f0d4c9793e4aec which causes this exception:

E/SystemServer( 2653): Failure starting Connectivity Service
E/SystemServer( 2653): java.lang.IllegalMonitorStateException: object not locked by thread before wait()
E/SystemServer( 2653):  at java.lang.Object.wait(Native Method)
E/SystemServer( 2653):  at java.lang.Object.wait(Object.java:358)
E/SystemServer( 2653):  at com.android.server.ConnectivityService$ConnectivityThread.getServiceInstance(ConnectivityService.java:186)
E/SystemServer( 2653):  at com.android.server.ConnectivityService.getInstance(ConnectivityService.java:200)
E/SystemServer( 2653):  at com.android.server.ServerThread.run(SystemServer.java:262)

Change-Id: Idd139e426e61a1913b0bf343e2f0a0b1990ba8bb
 2010-09-01 21:18:22 -07:00
Dianne Hackborn
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Jim Miller
bc4603b0b1 Fix 2579224: Add a separate timeout for lockscreen vs display 
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I41fe10e31688308f52695ad3ee30a4b0507112bd
 2010-09-01 21:00:30 -07:00
Jason Chen
5486dcb00a More fixes to current.xml to reflect the state of WebSettings 
Change-Id: I00f9c2a7242ebf34f8c67a8cf8a47afbfe70cc71
 2010-09-01 20:14:24 -07:00
Jason Chen
5acddcef22 am 9fadca71: (-s ours) am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Merge commit '9fadca71e455a6c849311083677351d4dc64b792'

* commit '9fadca71e455a6c849311083677351d4dc64b792':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
 2010-09-01 19:39:00 -07:00
Dianne Hackborn
08e60f2a16 Improve messages when java process is starting. 
Change-Id: I33e401eb240a454845987c10d44e3520e419721b
 2010-09-01 19:17:47 -07:00
Jason Chen
9dc2e75e27 Add Deprecated annotation to getPluginsPath/setPluginsPath 
Javadoc annotations aren't enough to properly mark an API
as deprecated. This change adds the @Deprecated annotation
to the source and updates current.xml.

Change-Id: I04a398fc04ad99979c674789af5af994fbd25be0
 2010-09-01 19:17:22 -07:00
Jason Chen
9fadca71e4 am b766ab83: DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp

* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
  DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
 2010-09-01 19:16:41 -07:00
Jason Chen
b766ab830a DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml 
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.

Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
 2010-09-01 19:04:18 -07:00
Hung-ying Tyan
f83d4f1779 resolved conflicts for merge of 3e4975a5 to master 
Change-Id: Icd382fc43c8a1975801ab42eb184b633520149c7
 2010-09-02 09:56:04 +08:00
Hung-ying Tyan
3e4975a52c am 3424c02e: Add software features for SIP and VOIP 
Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp

* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
  Add software features for SIP and VOIP
 2010-09-01 18:01:31 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP 
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
 2010-09-02 08:10:13 +08:00
Andreas Huber
53d7765eac am fd0eed00: am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 
Merge commit 'fd0eed007d99178092ede56ec2c4799046615f70'

* commit 'fd0eed007d99178092ede56ec2c4799046615f70':
  Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
 2010-09-01 17:03:59 -07:00
James Dong
5aa0adc610 am 3fd01c4d: am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 
Merge commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6'

* commit '3fd01c4da9b8fb7796d64096b9bbd6fcdee280e6':
  Make sure that if initialization fails, AudioSource still behaves well.
 2010-09-01 17:03:54 -07:00
Dan Morrill
90324669f2 am 61f1cbdd: am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 
Merge commit '61f1cbdd71942433ce1515b614ec3d9c259ea037'

* commit '61f1cbdd71942433ce1515b614ec3d9c259ea037':
  Adding a feature definition corresponding to support for Near-Field
 2010-09-01 17:03:33 -07:00
Nick Kralevich
b089a09764 am b4de2f99: am 05f0382b: When dropping privileges, check return values. 
Merge commit 'b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c'

* commit 'b4de2f997591d3ee5f1eff92fbf2d4628cee5f2c':
  When dropping privileges, check return values.
 2010-09-01 17:03:28 -07:00
Andreas Huber
d79de7bc36 am 4fd76ba2: am 81f339bc: Merge "Fixing the build." into gingerbread 
Merge commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b'

* commit '4fd76ba2270da1df12ae11f6d3d3ed564e38464b':
  Fixing the build.
 2010-09-01 16:57:58 -07:00
Kenny Root
59f6b0da29 am 9088a3d1: am 7c1bd7fd: Fix logic error in downgrade of system apps 
Merge commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6'

* commit '9088a3d153ef28dfa383fda0935d99bdc0c2b2f6':
  Fix logic error in downgrade of system apps
 2010-09-01 16:57:52 -07:00
Kenny Root
188aa566e6 am 11d12f7e: am fca5677a: Merge "Add null check for package settings" into gingerbread 
Merge commit '11d12f7efc588b0e945c42952e67d96f2421dc26'

* commit '11d12f7efc588b0e945c42952e67d96f2421dc26':
  Add null check for package settings
 2010-09-01 16:57:42 -07:00
Adam Powell
b3e6d570a9 am 6fb81376: (-s ours) am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 
Merge commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186'

* commit '6fb81376b6e062d9b0ce4d91e23c2a88572b8186':
  DO NOT MERGE Integrate edge effects into WebView.
 2010-09-01 16:57:36 -07:00
Jason Sams
18b8a04cdc Merge "Remove ACC and other legacy bits from RS." 2010-09-01 16:45:18 -07:00
Dmitry Shmidt
2471287bfd Merge "bugreport: bcm4329: Add Wifi state dump" 2010-09-01 16:28:00 -07:00
Robert Greenwalt
21e7844967 Merge "Remember mobile nets availability" 2010-09-01 16:20:09 -07:00
Dmitry Shmidt
5500c4f0a1 bugreport: bcm4329: Add Wifi state dump 
Change-Id: I00a448bd44f3f5ca76948acad12ba20be794f3bd
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2010-09-01 16:18:14 -07:00
Robert Greenwalt
d3afa8f8ff Merge "Fix NPE in toString" 2010-09-01 16:18:01 -07:00
Robert Greenwalt
0dd89664c0 Merge "Add a default dns entry if none is provided" 2010-09-01 16:11:04 -07:00
Andreas Huber
fd0eed007d am a2511da9: Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 
Merge commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef' into gingerbread-plus-aosp

* commit 'a2511da9d65b11be7f59ed3f525f77e85aeb4bef':
  Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
 2010-09-01 15:56:31 -07:00
James Dong
3fd01c4da9 am d3c1bae4: Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 
Merge commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3' into gingerbread-plus-aosp

* commit 'd3c1bae4eb78404bd1e17b7acf67087a18c83ef3':
  Make sure that if initialization fails, AudioSource still behaves well.
 2010-09-01 15:56:25 -07:00
Andreas Huber
5b988318a8 Merge "resolved conflicts for merge of 71c908c4 to master" 2010-09-01 15:54:26 -07:00
Andreas Huber
ee9c3dbdd0 resolved conflicts for merge of 71c908c4 to master 
Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
 2010-09-01 15:53:26 -07:00
Romain Guy
2b9a92a80b Merge "Add support for Canvas flags on save." 2010-09-01 15:52:59 -07:00
Romain Guy
8aef54fa17 Add support for Canvas flags on save. 
This is required for the rewrite of layers support.

Change-Id: I5c0867dcf5aeb0392c8d0fbab05febb0eaff70d9
 2010-09-01 15:49:25 -07:00
Andreas Huber
a2511da9d6 Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 2010-09-01 15:44:46 -07:00
Nipun Kwatra
8d89cdad48 Merge "Support for auxiliary video parameters." 2010-09-01 15:43:42 -07:00