Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,528 Commits 3 Branches 0 Tags
514cd028ca20fd88ac8f20f14d0ad2b66cede1b2
Commit Graph

52216 Commits

Author SHA1 Message Date
Nancy Chen
514cd028ca am 3b8d8f76: am e8f1f899: am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 
* commit '3b8d8f761a5d77b1ee85d777a75c638c38957061':
  Add phone account field for voicemail to distinguish the source.
 2015-05-13 22:36:25 +00:00
Nancy Chen
3b8d8f761a am e8f1f899: am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 
* commit 'e8f1f899a127bc6c809f635b70be434c51cf6415':
  Add phone account field for voicemail to distinguish the source.
 2015-05-13 22:21:46 +00:00
Nancy Chen
782509076b Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev 2015-05-13 21:54:48 +00:00
Kenny Guy
2de4dd0b8f am bd5d3a03: am a6e65d2c: am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 
* commit 'bd5d3a03edbded408d3478605f30d6646d98de51':
  Allowing profile to set a subset of keyguard restrictions.
 2015-05-13 21:45:58 +00:00
Kenny Guy
bd5d3a03ed am a6e65d2c: am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 
* commit 'a6e65d2ce7aa084732a592c71f4679f433efdc89':
  Allowing profile to set a subset of keyguard restrictions.
 2015-05-13 21:34:22 +00:00
Jeff Sharkey
6906e04920 am 06defabf: am cddcdf88: am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev 
* commit '06defabf3dcbb7168b9eec5e2805d607117401e7':
  Determine if we have adoptable disks.
 2015-05-13 21:26:36 +00:00
Jeff Sharkey
06defabf3d am cddcdf88: am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev 
* commit 'cddcdf8824a13923118bd0c9d19dd7487ebb7f96':
  Determine if we have adoptable disks.
 2015-05-13 21:13:23 +00:00
Kenny Guy
467eb0566f Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev 2015-05-13 21:07:17 +00:00
Jorim Jaggi
25c861fc42 am 8fd6d671: am 0d56be54: am 131a19ee: Merge "Persist fingerprint names" into mnc-dev 
* commit '8fd6d6715558a67130f8ff6d84c4c28ef80a874d':
  Persist fingerprint names
 2015-05-13 21:02:11 +00:00
Todd Kennedy
b9fd81b8d0 am 983f5bb1: am b2a3ad24: am d90bf462: Merge "Don\'t negate saving state" into mnc-dev 
* commit '983f5bb1dce66c3ce6fa8f187ab715fdc1321ad0':
  Don't negate saving state
 2015-05-13 21:02:06 +00:00
Jeff Sharkey
c968e21937 Merge "Determine if we have adoptable disks." into mnc-dev 2015-05-13 20:57:03 +00:00
Jeff Sharkey
0d838a0fad Determine if we have adoptable disks. 
Bug: 19993667
Change-Id: I9b21b05736c22d34ca22f5ad6e1a6ebec440cfb6
 2015-05-13 13:54:35 -07:00
Jorim Jaggi
8fd6d67155 am 0d56be54: am 131a19ee: Merge "Persist fingerprint names" into mnc-dev 
* commit '0d56be54e729adc0d2f568e9679ec15e1a172366':
  Persist fingerprint names
 2015-05-13 20:48:40 +00:00
Todd Kennedy
983f5bb1dc am b2a3ad24: am d90bf462: Merge "Don\'t negate saving state" into mnc-dev 
* commit 'b2a3ad246fd3a499c64c154490765eb76384d66d':
  Don't negate saving state
 2015-05-13 20:48:36 +00:00
Julia Reynolds
f1bdaa2d26 am b8fb725f: am f7056dbd: am 396d9440: Merge "Remove initiator name param." into mnc-dev 
* commit 'b8fb725f0ab092ec37a53cc7b0e28cf473d6c841':
  Remove initiator name param.
 2015-05-13 20:42:21 +00:00
Kenny Root
a1bb98f6bf am 959de774: am ca549d9c: am f5d758c0: Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev 
* commit '959de774dc77bca1318243e309d33c1e83fcd22c':
  Start handshake before calling hostname verifier, part 2
 2015-05-13 20:42:16 +00:00
John Spurlock
f98ee06110 am fe4b8433: am 9e957b1b: am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 
* commit 'fe4b843390b13429022a5ac0f661dcc573ff7fa6':
  Zen: Use shorter version of countdown condition summary in footer.
 2015-05-13 20:42:12 +00:00
Jeff Sharkey
9e9c24333e am 7930df19: am c4febd4c: am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev 
* commit '7930df190ae19a665852e1ea5b047145889c878a':
  Hide API not ready for prime time.
 2015-05-13 20:42:07 +00:00
Jorim Jaggi
131a19ee6f Merge "Persist fingerprint names" into mnc-dev 2015-05-13 20:32:31 +00:00
Julia Reynolds
b8fb725f0a am f7056dbd: am 396d9440: Merge "Remove initiator name param." into mnc-dev 
* commit 'f7056dbd307d64bdd3a5e09613ddc83bf9e06091':
  Remove initiator name param.
 2015-05-13 20:31:12 +00:00
Kenny Root
959de774dc am ca549d9c: am f5d758c0: Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev 
* commit 'ca549d9c2fa24bd322b4a75e720ab15928af0e57':
  Start handshake before calling hostname verifier, part 2
 2015-05-13 20:31:08 +00:00
John Spurlock
fe4b843390 am 9e957b1b: am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 
* commit '9e957b1b25bd417ef111f90a8eeb4b6a0a861874':
  Zen: Use shorter version of countdown condition summary in footer.
 2015-05-13 20:31:03 +00:00
Jeff Sharkey
7930df190a am c4febd4c: am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev 
* commit 'c4febd4c4275df1324faae6ee33dde18239b4b5d':
  Hide API not ready for prime time.
 2015-05-13 20:30:58 +00:00
Todd Kennedy
d90bf46264 Merge "Don't negate saving state" into mnc-dev 2015-05-13 20:27:17 +00:00
Jorim Jaggi
ee77cebc1a Persist fingerprint names 
Bug: 20469328
Change-Id: I8f4a988687bfb78c36cc7cf187103a9d93ed4535
 2015-05-13 13:25:26 -07:00
Julia Reynolds
396d944001 Merge "Remove initiator name param." into mnc-dev 2015-05-13 20:14:44 +00:00
Kenny Root
f5d758c006 Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev 2015-05-13 20:14:26 +00:00
Jeff Sharkey
ed8e71e03d am b26b17a7: am 276671a3: am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev 
* commit 'b26b17a7c5494be14b885f179e85350efb8daa86':
  Rewriting should fail when any paths are null.
 2015-05-13 20:13:32 +00:00
John Spurlock
fb13d497ae Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev 2015-05-13 20:10:49 +00:00
Jeff Sharkey
2817f22d15 Merge "Hide API not ready for prime time." into mnc-dev 2015-05-13 20:08:13 +00:00
Jeff Sharkey
f85ac77f0c Hide API not ready for prime time. 
Bug: 20642684
Change-Id: I133f023ba7d1d9572175a8f6a3e3c8314c5a897d
 2015-05-13 13:07:29 -07:00
Kenny Root
725a4a71b8 Start handshake before calling hostname verifier, part 2 
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.

Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.

Follow up for change 317c0a4959df0361431d5fbf7dacc162bfb48cd2

Bug: 21118659
Change-Id: I8c606a78ba8a990b4e0d28880b566867261fefbc
 2015-05-13 13:04:44 -07:00
Jeff Sharkey
b26b17a7c5 am 276671a3: am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev 
* commit '276671a3d08462943fb6ae0c34fdcc85d4c63e11':
  Rewriting should fail when any paths are null.
 2015-05-13 19:58:47 +00:00
John Spurlock
bbde26774f Zen: Use shorter version of countdown condition summary in footer. 
To try and keep to two-lines.

Bug: 21119801
Change-Id: I5a6760381a6b673b8481164f92cf6b7b236af349
 2015-05-13 15:45:40 -04:00
Jeff Sharkey
4af455beb7 Merge "Rewriting should fail when any paths are null." into mnc-dev 2015-05-13 19:39:26 +00:00
Jeff Sharkey
41be35dd01 Rewriting should fail when any paths are null. 
Bug: 21017105
Change-Id: I0c5e9c5bdf397d51e2799b06a52bc5bd0bdd09b0
 2015-05-13 12:38:16 -07:00
Kenny Root
84260768c4 Merge "Start handshake before calling hostname verifier" into mnc-dev 2015-05-13 19:04:09 +00:00
Kenny Root
423a47bb02 Start handshake before calling hostname verifier 
If the hostname verifier calls SSLSocket#getSession() before the
handshake has been started, it will implicitly start the handshake.
However, it will swallow any errors and return the canonical invalid
SSLSession instead. This makes it extremely difficult to debug issues.

Instead start the handshake before calling into the verifier since we
are guaranteed to be the first caller of #startHandshake() and won't
cause a renegotiation. That will allow us to see the actual
SSLHandshakeException if it occurs.

(cherry picked from commit 317c0a4959df0361431d5fbf7dacc162bfb48cd2 in
external/apache-http)

Bug: 14975169
Bug: 17332309
Bug: 17524215
Bug: 17812533
Bug: 18507278
Bug: 19069992
Bug: 19378885
Bug: 19414083
Bug: 19550311
Bug: 19731556
Bug: 19853723
Bug: 20908941
Bug: 21118659
Change-Id: Ie74ec12c8b131c7bf400a07fc91c78da4d5e470f
 2015-05-13 11:58:31 -07:00
Chris Wren
5f6a506bdb am ab559c01: am 37d3e6dd: am 5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev 
* commit 'ab559c01c886e6b0d36f9d8705f3c23ae84127cb':
  induct a bunch of new logging categories.
 2015-05-13 18:41:05 +00:00
Chris Wren
ab559c01c8 am 37d3e6dd: am 5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev 
* commit '37d3e6dd53311f12585b9481b23261b4d562660a':
  induct a bunch of new logging categories.
 2015-05-13 18:29:48 +00:00
Jonathan Basseri
b105d967c0 am 4df9a6b7: am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 
* commit '4df9a6b73d3db5a7969da67e0df82bd24e9da2b3':
  Switching to PersistableBundle in carrier config API.
 2015-05-13 18:23:13 +00:00
Nicolas Prevot
323fb254ae am a428fabc: am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 
* commit 'a428fabc09e43a5cd1bb6e8edda546ee917f49dd':
  Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
 2015-05-13 18:23:08 +00:00
Todd Kennedy
46d168fb6b Don't negate saving state 
In the original implementation, we would only save the state if the
activity was "!isFinishing()". That was abstracted into a method
that returned whether we should save state. However, the "!" wasn't
removed. D'oh.

Bug: 20860094
Change-Id: I8827cb265f2e7fb911f5d110c56e464aa092bfe7
 2015-05-13 11:13:58 -07:00
Jonathan Basseri
4df9a6b73d am 20d14fe3: am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev 
* commit '20d14fe3a753c7bfbb2b471c853fddfe8740d593':
  Switching to PersistableBundle in carrier config API.
 2015-05-13 18:11:05 +00:00
Nicolas Prevot
a428fabc09 am a09f296c: am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev 
* commit 'a09f296c0d6cd6f562391991a51e0a3d5c6356b7':
  Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.
 2015-05-13 18:10:59 +00:00
Chad Brubaker
90c66e3ded Merge "Add keystore onUserAdded/Removed methods" into mnc-dev 2015-05-13 18:10:05 +00:00
Chris Wren
5e4027fe25 Merge "induct a bunch of new logging categories." into mnc-dev 2015-05-13 18:05:56 +00:00
Kenny Root
45c4d5a46b am 8550861f: Merge "Start handshake before calling hostname verifier" into mnc-dev-plus-aosp 
* commit '8550861fe0c17488a3db368fb5da0b59bef5c13f':
  Start handshake before calling hostname verifier
 2015-05-13 18:05:32 +00:00
Mady Mellor
56ce4f6a18 am 15398fae: am 4241e307: am 21623faa: Merge "Fix issue where handle is in front of word rather than end of word" into mnc-dev 
* commit '15398faeb0482c39075718d70f065ff33d01a2ce':
  Fix issue where handle is in front of word rather than end of word
 2015-05-13 18:05:27 +00:00
Kenny Root
8550861fe0 Merge "Start handshake before calling hostname verifier" into mnc-dev-plus-aosp 2015-05-13 17:57:54 +00:00