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

83988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rich cannings
4d0b152482 am 8916311d: am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev 
* commit '8916311dba4b980c98583ce6ca3333105a286523':
  Pass URLs to package verifiers
 2012-08-20 14:28:40 -07:00
Kenny Root
d8b048e81d am 7cb07962: am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 
* commit '7cb079629ca2d5a4009ec9a50268b4e7b650677d':
  Add AndroidKeyStore provider for KeyStore API
 2012-08-20 14:27:01 -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
George Mount
eb9b2c095d am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 
* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.
 2012-08-20 13:43:14 -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
Victoria Lease
df889045c1 am 66e1635d: (-s ours) am df8ef4b1: DO NOT MERGE LocaleSpan makes Han disambiguation easy! 
* commit '66e1635d7f9a8955b12755f0f962d60408b8c207':
  DO NOT MERGE LocaleSpan makes Han disambiguation easy!
 2012-08-20 13:26:02 -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
f558c435e9 am b853a942: (-s ours) am 6fb73ab8: Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 
* commit 'b853a94284885b05f21a33c1e5011d878bf7e709':
  DO NOT MERGE Han Preference
 2012-08-20 13:16:47 -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
df6c26e562 am 3ca1e412: am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '3ca1e412b720a8bd28fd7e430b38788835ea13e5':
  Use Libcore.os.umask for setting umask
 2012-08-20 13:01:45 -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
Robert Greenwalt
1a1ee224c1 am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 
* commit 'bb1d98473c737bff05e3ae11d8ec53195e04725a':
  Update TCP buffer size when switching network type
 2012-08-20 12:57:28 -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
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
44b7a50fce am 88ba79b5: am fc7e851f: Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev 
* commit '88ba79b5e718c8e33147e95e9b6134056cb330d4':
  Add getmtime to Android KeyStore API
 2012-08-20 12:48:51 -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
6963dfb2f9 am 947c6424: am 99de2459: Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev 
* commit '947c6424c1fa4aaf79429c85c6faff4d1d4d4ed5':
  Respect child drawing order when dispatching touch events
 2012-08-20 11:51:05 -07:00
Dirk Dougherty
99c1673bd8 am 1b6b8f13: am b3655894: am 69b6a32f: am a18cfcca: Doc change: Remove japanese localized index page. 
* commit '1b6b8f13b2bf87221f3be2068d5b7856864c0a8f':
  Doc change: Remove japanese localized index page.
 2012-08-20 11:49:28 -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
4766114d25 am a9b22bf4: am 9403fca0: am 6a37a254: am e0024573: Merge "Release JNI local references as soon as possible." 
* commit 'a9b22bf4168c2d110b227dbca91f7f6cdabfcb28':
  Release JNI local references as soon as possible.
 2012-08-20 10:51:21 -07:00
Amith Yamasani
9eda85fbdf am 7c0c206b: am 2d78fa2d: am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 
* commit '7c0c206b287b1e57b44a4aeeaa95014b8d8c40dd':
  ProviderMap: remove hashmap when entire user specific entries are removed
 2012-08-20 10:51:17 -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
Craig Mautner
b868f1914e am 8f260c9a: am ec42c3c3: Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev 
* commit '8f260c9a685af38940d498f3d8a4ee2b70e2971d':
  Ensure that mAllAppWinAnimators is not null.
 2012-08-20 10:35:42 -07:00
Craig Mautner
8f260c9a68 am ec42c3c3: Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev 
* commit 'ec42c3c35fd4c16e1823cfd0e5b589ed2d205aa7':
  Ensure that mAllAppWinAnimators is not null.
 2012-08-20 10:33:29 -07:00
Craig Mautner
ec42c3c35f Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev 2012-08-20 10:30:00 -07:00
Craig Mautner
bea12bdc2e Ensure that mAllAppWinAnimators is not null. 
The method showAllWindowsLocked can be called from the layout
side of the WindowManagerService. Previously the AppWindowAnimator
member mAllAppWinAnimators was created on the animation side. If
showAllWindowsLocked was called before the first animation of the
activity an NPE would occur. This fix creates mAllAppWinAnimators
when the AppWindowAnimator is created and also updates it with
current values before calling showAllWindowsLocked.

Fixes bug 6917136.

Change-Id: If3ace22022b65c6888bbb9d0575efe9a45d86475
 2012-08-20 10:23:18 -07:00