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

84050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
38f05e09bd am 3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev 
* commit '3fee5c6bd8e13f8ef7e1ba1df3a8bf56ebb36221':
  Fix some proximity sensor bugs.
 2012-08-20 15:01:39 -07:00
Iliyan Malchev
c456bf13ac am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 
* commit '8756bd1d6b43e1724996897cf4593d5ea5b00213':
  Revert "Revert "Add timestamp in scan results""
 2012-08-20 14:59:49 -07:00
Jeff Brown
3fee5c6bd8 Merge "Fix some proximity sensor bugs." into jb-mr1-dev 2012-08-20 14:59:18 -07:00
Jean-Baptiste Queru
acbbd1142d resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev 
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
 2012-08-20 14:57:23 -07:00
Iliyan Malchev
8756bd1d6b Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 2012-08-20 14:57:14 -07:00
Jeff Brown
9a538ee7bd Add factory test feature to shut off on long press power. 
Bug: 6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862
 2012-08-20 14:56:57 -07:00
Benoit Goby
e6bc1238b7 am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 
* commit '7b7feee80331deed883602d5861074ca66293e9c':
  Add UsbDebuggingManager and UsbDebuggingActivity
 2012-08-20 14:51:15 -07:00
Jean-Baptiste Queru
f96fcd5095 am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 14:50:45 -07:00
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error" 
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 14:50:40 -07:00
Benoit Goby
7b7feee803 Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 2012-08-20 14:48:11 -07:00
Jean-Baptiste Queru
26f8ce83e0 Merge "To avoid the JNI memory leaks in video editor codes" 2012-08-20 14:29:51 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
rich cannings
8916311dba am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev 
* commit 'a811e0848dc28f73e31a3f84d8ceca3b1f504b52':
  Pass URLs to package verifiers
 2012-08-20 14:27:00 -07:00
rich cannings
a811e0848d Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-20 14:24:49 -07:00
Kenny Root
7cb079629c am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 
* commit '672cfdc5b6194a416eae93f5ebe82cb624e2add6':
  Add AndroidKeyStore provider for KeyStore API
 2012-08-20 14:24:11 -07:00
Kenny Root
672cfdc5b6 Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 2012-08-20 14:20:32 -07:00
Jeff Brown
5f47ba4db7 Adjust auto-brightness time constants. 
Specifically, dim a little more slowly.

Change-Id: I10d66a83ddc3a63f8c93d740a0cb116e6c974d10
 2012-08-20 14:02:12 -07:00
Benoit Goby
4e68bd420b Add UsbDebuggingManager and UsbDebuggingActivity 
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.

Change-Id: I115c828331d8e326c380844ee33915d5dff22260
 2012-08-20 13:44:34 -07:00
George Mount
00d2eba501 am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 
* commit '9af67e8f6c7dd98baa6232ff2cda97510b827637':
  Add getDefaultUserAgent to WebSettings.
 2012-08-20 13:40:34 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
Jeff Brown
6307a150d3 Fix some proximity sensor bugs. 
Forgot to clear waiting for proximity negative flag.
Waiting for proximity negative also shouldn't turn the screen off
if it is currently on.

Change-Id: I9885b2f54b185beb961acda44176bc5f11a9f58b
 2012-08-20 13:25:08 -07:00
Victoria Lease
66e1635d7f am df8ef4b1: DO NOT MERGE LocaleSpan makes Han disambiguation easy! 
* commit 'df8ef4b139a8918895f8a5c62536123da06e81fe':
  DO NOT MERGE LocaleSpan makes Han disambiguation easy!
 2012-08-20 13:24:42 -07:00
rich cannings
706e8ba26b Pass URLs to package verifiers 
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
 2012-08-20 13:20:14 -07:00
Victoria Lease
df8ef4b139 DO NOT MERGE LocaleSpan makes Han disambiguation easy! 
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.

I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I5692859bfd2aafc284172454d943afc250b22535
 2012-08-20 13:17:58 -07:00
Victoria Lease
b853a94284 am 6fb73ab8: Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 
* commit '6fb73ab83f9c1b745ccff4fb92babb429b9215ee':
  DO NOT MERGE Han Preference
 2012-08-20 13:14:20 -07:00
Victoria Lease
6fb73ab83f Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 2012-08-20 13:11:43 -07:00
Kenny Root
3ca1e412b7 am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '80618d66b02d8cce325cdaa184435f43818a062b':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:59:19 -07:00
Kenny Root
80618d66b0 am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:57:36 -07:00
Kenny Root
7d5b22afae am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:55:11 -07:00
Robert Greenwalt
bb1d98473c am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 
* commit '80bb8d2906ed90668de66b3b2554e69f97c25412':
  Update TCP buffer size when switching network type
 2012-08-20 12:55:10 -07:00
Iliyan Malchev
06c43d575c Revert "Revert "Add timestamp in scan results"" 
With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 578531082b8e8c8aa03868e69591b7613b0e8b8e

Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
 2012-08-20 12:52:35 -07:00
Robert Greenwalt
80bb8d2906 Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 2012-08-20 12:52:24 -07:00
Kenny Root
88ba79b5e7 am fc7e851f: Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev 
* commit 'fc7e851fd93a6d6457bbca09117fbe78649dae5d':
  Add getmtime to Android KeyStore API
 2012-08-20 12:47:38 -07:00
Kenny Root
fc7e851fd9 Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev 2012-08-20 12:45:17 -07:00
Kenny Root
e29df16cb5 Add AndroidKeyStore provider for KeyStore API 
This introduces a public API for the Android keystore that is accessible
via java.security.KeyStore API. This allows programs to store
PrivateKeyEntry and TrustedCertificateEntry items visible only to
themselves.

Future work should include:

* Implement KeyStore.CallbackHandlerProtection parameter to allow the
  caller to request that the keystore daemon unlock itself via the
  system password input dialog.

* Implement SecretKeyEntry once that support is in keystore daemon

Change-Id: I382ffdf742d3f9f7647c5f5a429244a340b6bb0a
 2012-08-20 12:44:40 -07:00
Kenny Root
f029c22f82 Merge "Use Libcore.os.umask for setting umask" 2012-08-20 12:32:14 -07:00
Robert Greenwalt
d14e176272 Update TCP buffer size when switching network type 
Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2
 2012-08-20 12:28:51 -07:00
Kenny Root
4c74f8c171 Use Libcore.os.umask for setting umask 
Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
 2012-08-20 12:24:05 -07:00
Adam Powell
947c6424c1 am 99de2459: Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev 
* commit '99de2459e200e0c86d55d5eee7ea000fd030990f':
  Respect child drawing order when dispatching touch events
 2012-08-20 11:47:42 -07:00
Dirk Dougherty
1b6b8f13b2 am b3655894: am 69b6a32f: am a18cfcca: Doc change: Remove japanese localized index page. 
* commit 'b365589487044c3b0241c8846b6e7843a32bdb0c':
  Doc change: Remove japanese localized index page.
 2012-08-20 11:46:00 -07:00
Adam Powell
99de2459e2 Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev 2012-08-20 11:44:45 -07:00
Dirk Dougherty
b365589487 am 69b6a32f: am a18cfcca: Doc change: Remove japanese localized index page. 
* commit '69b6a32f0c9df85b29dc8adc2c1f15e5f52dd6ba':
  Doc change: Remove japanese localized index page.
 2012-08-20 11:44:07 -07:00
Dirk Dougherty
69b6a32f0c am a18cfcca: Doc change: Remove japanese localized index page. 
* commit 'a18cfccac509e124d0a80c109a5711b336d41f75':
  Doc change: Remove japanese localized index page.
 2012-08-20 11:42:30 -07:00
Dirk Dougherty
a18cfccac5 Doc change: Remove japanese localized index page. 
Change-Id: I69b60435e7062d6ec39fe91595232695a37f591d
 2012-08-20 11:25:49 -07:00
Jean-Baptiste Queru
a9b22bf416 am 9403fca0: am 6a37a254: am e0024573: Merge "Release JNI local references as soon as possible." 
* commit '9403fca0b1698ef31285a8a2e3123e22f53b1528':
  Release JNI local references as soon as possible.
 2012-08-20 10:49:16 -07:00
Amith Yamasani
7c0c206b28 am 2d78fa2d: am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 
* commit '2d78fa2d2558dc8c6d6400232c742da7936c6204':
  ProviderMap: remove hashmap when entire user specific entries are removed
 2012-08-20 10:49:13 -07:00
Jean-Baptiste Queru
9403fca0b1 am 6a37a254: am e0024573: Merge "Release JNI local references as soon as possible." 
* commit '6a37a254507bb2bff944a0fe984e287994c31846':
  Release JNI local references as soon as possible.
 2012-08-20 10:47:46 -07:00
Amith Yamasani
2d78fa2d25 am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 
* commit 'ff7735b0ee8c3347d0f3cb1866e454be0e9534e2':
  ProviderMap: remove hashmap when entire user specific entries are removed
 2012-08-20 10:47:41 -07:00
Jean-Baptiste Queru
6a37a25450 am e0024573: Merge "Release JNI local references as soon as possible." 
* commit 'e00245737cc4844b77f95538e0728a4166b856a0':
  Release JNI local references as soon as possible.
 2012-08-20 10:45:17 -07:00
Amith Yamasani
ff7735b0ee am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 
* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed
 2012-08-20 10:45:12 -07:00