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

30066 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
James Dong
d3c1bae4eb Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 2010-09-01 15:41:10 -07:00
Robert Greenwalt
e90aa5e97e Add a default dns entry if none is provided 
Fixes part of emulator which isn't telling us about dns servers.
Gets some stuff running, but browser is still broken.

bug:2961703
Change-Id: I53b946eba434aca1bb524c2acaf77922377948d1
 2010-09-01 15:25:51 -07:00
Irfan Sheriff
dc559c6fef Merge "Remove unused Intent filter values." 2010-09-01 15:20:50 -07:00
Wink Saville
5de38d11f6 Remove unused Intent filter values. 
Change-Id: I902cdbbff9238b2ac975441ef6ecb3c6d5c7a56f
 2010-09-01 15:16:56 -07:00
Wink Saville
276e8d44a4 Merge "Changed ConnectivityService#getServiceInstance so its a singleton." 2010-09-01 15:15:06 -07:00
Dan Morrill
61f1cbdd71 am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp

* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
  Adding a feature definition corresponding to support for Near-Field
 2010-09-01 15:05:34 -07:00
Andreas Huber
4d8f66bce3 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. 
Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
 2010-09-01 15:05:28 -07:00
Dan Morrill
a800a2efa2 Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 2010-09-01 15:03:02 -07:00
Nick Kralevich
b4de2f9975 am 05f0382b: When dropping privileges, check return values. 
Merge commit '05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp

* commit '05f0382bcf11d96760ee8cf9110099a1661eed7c':
  When dropping privileges, check return values.
 2010-09-01 14:59:52 -07:00
Andreas Huber
4fd76ba227 am 81f339bc: Merge "Fixing the build." into gingerbread 
Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp

* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
  Fixing the build.
 2010-09-01 14:53:12 -07:00
Kenny Root
9088a3d153 am 7c1bd7fd: Fix logic error in downgrade of system apps 
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp

* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
  Fix logic error in downgrade of system apps
 2010-09-01 14:52:54 -07:00
Wink Saville
28961cc02f Changed ConnectivityService#getServiceInstance so its a singleton. 
Change-Id: I27b5688a50917b01fb2fcd1c124da77ccae226b5
 2010-09-01 14:48:29 -07:00
Nick Kralevich
05f0382bcf When dropping privileges, check return values. 
setuid() and family can fail.  Check return values to make
sure this doesn't happen unexpectedly.

Also call setgid() to drop root group permissions.

Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
 2010-09-01 14:44:54 -07:00
Dan Morrill
76437d3793 Adding a feature definition corresponding to support for Near-Field 
Communications (NFC).

Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
 2010-09-01 14:42:23 -07:00
Robert Greenwalt
cff25ffb0a Remember mobile nets availability 
Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
 2010-09-01 14:38:07 -07:00
Jason Sams
0eb9b77eec Merge "Remove functions for reflecting dalvik classes to rs types." 2010-09-01 14:36:47 -07:00
Jamie Gennis
2198d7517c Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API."" 
This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing
changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
 2010-09-01 14:32:35 -07:00
Jason Sams
deb0008c63 Remove ACC and other legacy bits from RS. 
Change-Id: I12a3b0477f3201ec7ca63564ae2b387ecc89dedf
 2010-09-01 14:23:13 -07:00
Jason Sams
e447a78635 Remove functions for reflecting dalvik classes to rs types. 
Change-Id: I41bc7fd704772d177f8035c04256d0ca63e4398b
Change-Id: I4df3673a1db1e79c309ab4eb41d2145802ed322c
 2010-09-01 14:22:36 -07:00