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

123945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
80e84e2db9 am f3cecfa2: am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit 'f3cecfa2185ef5622992b21da8204b8b6590ef2d':
  Add documentation for AndroidKeyStore
 2014-06-10 02:39:28 +00:00
Robert Ly
f3cecfa218 am 55d525b2: am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '55d525b26b716351625798675afe69c6cf43cf5a':
  Add documentation for AndroidKeyStore
 2014-06-10 02:36:10 +00:00
Robert Ly
55d525b26b am 716cc7dc: Add documentation for AndroidKeyStore 
* commit '716cc7dcac1bb9279326ab92a78a246b3a70de4e':
  Add documentation for AndroidKeyStore
 2014-06-10 02:32:29 +00:00
Justin Koh
42c53fd646 Merge "Catch OperationUnsupportedException when linkifying using WebView" into klp-modular-dev 2014-06-10 01:05:05 +00:00
Aaron Whyte
83955cb260 Catch OperationUnsupportedException when linkifying using WebView 
This fixes a CTS test for Wearable. We cannot check for FEATURE_WEBVIEW, because
there's no way to get a PackageManager from within these static methods.
Bug: 15131296

Change-Id: I7bf7564b6209f330a413ed54a94be1e07fedb30d
 2014-06-09 17:59:03 -07:00
Justin Koh
b7c39cee9e Remove WebIconDatabase calls from android.provider.Browser 
This class has been deprecated, so no need to call it.

Bug: 15088030
Change-Id: I6092a9d5f7a12cc14def0996efff7cb689935acb
 2014-06-09 17:50:34 -07:00
Amit Mahajan
437a77d4bb am 3f175a35: am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '3f175a3587f5f7c7d6189c0fd09468bae4e81325':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 21:12:43 +00:00
Justin Koh
ce8c1086fb am eba8782a: Add NPE check to getSystemWindowInsets 
* commit 'eba8782a1f8412a3510fc78a71b843ef6e89bdbb':
  Add NPE check to getSystemWindowInsets
 2014-06-09 21:12:39 +00:00
Justin Koh
2be4ddc403 am a5de8479: Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 
* commit 'a5de8479f442b7e6f8d285db58713e42fb922798':
  Fix Browser when running on a platform without webview
 2014-06-09 21:12:35 +00:00
Robert Ly
a60406f546 am e70609c8: am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e70609c87e7de59dbe9c01226bd251a705e71305':
  remove erroneous file
 2014-06-09 21:12:31 +00:00
Adam Lesinski
5fed49f7d6 am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 
* commit '4d9fcae2024c9be8d5bd7e92cd836aa8b9cacc5b':
  Allow for a NoOp implementation of DrmManagerClientImpl
 2014-06-09 21:12:25 +00:00
Michael Kolb
1e6706abb2 am 4bdc93d6: Merge "Remove circular mask" into klp-modular-dev 
* commit '4bdc93d63e9edc7840a227ea1824f1f7ac93933e':
  Remove circular mask
 2014-06-09 21:12:19 +00:00
Amit Mahajan
3f175a3587 am e5a28d34: am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit 'e5a28d34f662c469f85590dda28fc02eca12204b':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:50:09 +00:00
Amit Mahajan
e5a28d34f6 am 20c5ce50: Handle provisioning APN by turning off/on radio. 
* commit '20c5ce50c456742bf912ebb915be45bfdb51487d':
  Handle provisioning APN by turning off/on radio.
 2014-06-09 19:46:01 +00:00
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
 2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview 
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
 2014-06-09 11:28:53 -07:00
Amit Mahajan
20c5ce50c4 Handle provisioning APN by turning off/on radio. 
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
 2014-06-09 17:55:27 +00:00
Andrew Solovay
220cf297d8 docs: New "Verifying App Behavior on the Android Runtime (ART)" guide. 
Contains information for developers to make sure their apps work properly
with the ART runtime.

This doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html

This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.

Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3
 2014-06-09 10:10:27 -07:00
Robert Ly
e70609c87e am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit '5cb180541332d652ed661559dfaa55a0fcc3751b':
  remove erroneous file
 2014-06-09 16:54:45 +00:00
Elliott Hughes
ef00c16d62 am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:33:39 +00:00
Elliott Hughes
de1f00231f am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:30:03 +00:00
Elliott Hughes
2a1ed46dec Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 2014-06-09 16:26:28 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00
Robin Lee
0b889cd66f am db9e0a67: am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit 'db9e0a674ac3a9c71699618cb525fdd3c4669e30':
  Choose CA certificate storage according to userId
 2014-06-09 12:55:13 +00:00
Robin Lee
db9e0a674a am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
 2014-06-09 12:51:19 +00:00
Robin Lee
01c07a856d Merge "Choose CA certificate storage according to userId" 2014-06-09 12:47:08 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId 
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
 2014-06-09 12:45:17 +00:00
Calin Juravle
ee20e16d7b am 337f97be: am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '337f97bedc09354ea9a8a506aefccc39dd4248e8':
  Fixed comments related to profile properties.
 2014-06-09 09:56:37 +00:00
Calin Juravle
337f97bedc am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
  Fixed comments related to profile properties.
 2014-06-09 09:23:18 +00:00
Calin Juravle
97f7f24c9d Merge "Fixed comments related to profile properties." 2014-06-09 09:18:23 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties. 
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
 2014-06-09 10:13:55 +01:00
Robert Ly
5cb1805413 am e115755d: Merge "remove erroneous file" into klp-docs 
* commit 'e115755d0fbd067a1996eb448cda58a14cce22d1':
  remove erroneous file
 2014-06-08 08:35:23 +00:00
Robert Ly
e115755d0f Merge "remove erroneous file" into klp-docs 2014-06-08 05:39:55 +00:00
Robert Ly
6ee94e5388 remove erroneous file 
Change-Id: Idb46777d80ee1b6286769fdceba7639877ab2388
 2014-06-07 22:38:18 -07:00
Adam Lesinski
4d9fcae202 Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev 2014-06-06 21:13:16 +00:00
Ian Rogers
1f241f7e16 am 74de10a0: (-s ours) am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit '74de10a0f232142b7a004ac6ca0fc94553796730':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:54:08 +00:00
Ian Rogers
74de10a0f2 am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit 'd83ffe358db81abbde44ec38cd9121e67d25fbb3':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:42:12 +00:00
Ian Rogers
d83ffe358d Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 2014-06-06 19:34:13 +00:00
Michael Kolb
4bdc93d63e Merge "Remove circular mask" into klp-modular-dev 2014-06-06 15:26:17 +00:00
Calin Juravle
c88a5ac3ff am d1d46d9d: am bbf849b1: Merge "Add missing profiler options." 
* commit 'd1d46d9d5564a27dae45c2f2a62e6769402b556c':
  Add missing profiler options.
 2014-06-06 12:28:17 +00:00
Calin Juravle
d1d46d9d55 am bbf849b1: Merge "Add missing profiler options." 
* commit 'bbf849b1c686c9e09c4d59574da70181a47ebb5d':
  Add missing profiler options.
 2014-06-06 12:09:48 +00:00
Calin Juravle
bbf849b1c6 Merge "Add missing profiler options." 2014-06-06 12:06:36 +00:00
Calin Juravle
9828d067fb Add missing profiler options. 
Bug: 12877748

Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
 2014-06-06 12:55:23 +01:00
Deepanshu Gupta
b78cc30920 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit e345507ca4b7b83c6e0446788f4404eb697f945b)
 2014-06-05 18:32:14 -07:00
Vinod Krishnan
a3d5d3b8af am 90e96db0: Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 
* commit '90e96db0b5a200f528f1ca6a66d5aeaa5c915ca2':
  Adding a way to stub Vpn ConfirmDialog
 2014-06-06 00:16:40 +00:00
Prashant Malani
59b82c3eae am 42db3761: Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 
* commit '42db3761c9ee3df11a367cbc907f2ba433251634':
  DO NOT MERGE Change display state modification during dozing
 2014-06-06 00:16:35 +00:00
Vinod Krishnan
90e96db0b5 Merge "Adding a way to stub Vpn ConfirmDialog" into klp-modular-dev 2014-06-05 23:03:49 +00:00
Prashant Malani
42db3761c9 Merge "DO NOT MERGE Change display state modification during dozing" into klp-modular-dev 2014-06-05 23:03:19 +00:00
Vinod Krishnan
b0e5bbb657 Adding a way to stub Vpn ConfirmDialog 
- This is needed to pass CTS tests on the wear devices
- Related CL: http://ar/479486

Bug: 15087985

Change-Id: I56673ff6085618a03ec61031e3af0f6631cb3425
 2014-06-05 15:28:50 -07:00