Alex Klyubin
c99c2461b8
DO NOT MERGE Support cross-UID access from AndroidKeyStore.
...
This is meant for exposing the pre-existing cross-UID access to keys
backed by the keystore service via higher-level JCA API. For example,
this lets system_server use Wi-Fi or VPN UID keys via JCA API.
To obtain a JCA AndroidKeyStore KeyStore for another UID, use the
hidden system API AndroidKeyStoreProvider.getKeyStoreForUid(uid).
To generate a key owned by another UID, invoke setUid(uid) on
KeyGenParameterSpec.Builder.
This CL does not change the security policy, such as which UID can
access/modify which UIDs' keys. The policy is that only certain system
UIDs are permitted to access keys of certain other system UIDs.
Cherry-picked from 3876b1be27
2015-12-10 16:06:50 -08:00
Mitchell Wills
075698c35f
DO NOT MERGE Expose gscan exponential backoff API
...
Will be ignored until scan scheduling supports it
Cherry-picked from 2564d9a4ef
2015-12-10 16:06:50 -08:00
Mitchell Wills
21c748d091
DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class
...
Cherry-picked from 97c46ef286
2015-12-10 16:06:50 -08:00
Mitchell Wills
a23840e7a4
DO NOT MERGE Remove old APIs that are no longer used/implemented
...
All of these APIs were hidden and are no longer used by anyone. The scan
APIs are being replaced by the new WifiScanner API
Cherry-picked from 88d93cd68a
2015-12-10 16:06:50 -08:00
Mitchell Wills
5220b4a6ae
DO NOT MERGE Fix TimeUtils.formatDuration for exactly one of a unit
...
Previously printing a duration where a unit (except ms) was one and the
next smallest unit was zero would result in the duration being being
expressed in the next smallest unit. For example 1m0s0ms would be
formatted as 60s0ms.
Update testFormatHugeDuration to supporting times > 999 days
The implementation was fixed in 3d1933c45ff9a80cbbfe
2015-12-10 16:06:50 -08:00
Mitchell Wills
deced11e1a
DO NOT MERGE Don't cache ScanResults in WifiTracker if there is no SSID
...
Cherry-picked from 9df7904390
2015-12-10 16:06:50 -08:00
Mitchell Wills
5374e36bb5
DO NOT MERGE Add missing ap threshold config for hotlists
...
Cherry-picked from ff4fdceafe
2015-12-10 16:06:50 -08:00
Mitchell Wills
d1ed98f833
DO NOT MERGE Check if link stats are supported when reporting activity info
...
Cherry-picked from 9a568e6f2f
2015-12-10 16:06:50 -08:00
Mitchell Wills
b4bcdfc14b
DO NOT MERGE Remove driver stop delay config as it is no longer used
...
Cherry-picked from a4c1f6f061
2015-12-10 16:06:50 -08:00
Jan Nordqvist
255d41dce1
DO NOT MERGE Hotspot 2.0 relase 2 first cut.
...
CP mods to take a URL as a parameter, and new ScanInfo object.
Cherry-picked from 52eb29f082
2015-12-10 16:06:50 -08:00
Vinit Deshpande
d0266d3b63
DO NOT MERGE Re-enable wifi firmware debugging
...
This will be enabled till we are ready to ship
devices again.
Change-Id: I0440ebd9482412d538b1cdb7c768c8e238bea269
Cherry-picked from 794395465b
2015-12-10 22:10:32 +00:00
Jim Kaye
8366fdd6a8
Merge "Extend the \'qwerty\' key layout" am: 9a83f115ad
...
am: e579edc76b
2015-11-24 19:42:15 +00:00
Jim Kaye
e579edc76b
Merge "Extend the \'qwerty\' key layout"
...
am: 9a83f115ad
2015-11-24 19:33:57 +00:00
Jim Kaye
9a83f115ad
Merge "Extend the 'qwerty' key layout"
2015-11-24 19:27:46 +00:00
Sergio Giro
5da9170bd6
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am: d5a5d547d0
...
am: d9942006e4
2015-11-24 15:51:14 +00:00
Sergio Giro
d9942006e4
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
...
am: d5a5d547d0
2015-11-24 15:43:06 +00:00
Sergio Giro
d5a5d547d0
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
2015-11-24 11:14:24 +00:00
Jim Kaye
b45d99d7d9
Extend the 'qwerty' key layout
...
Add the App Switch (Recents) key.
Add media control keys.
These are needed to support Emulator UI
buttons for these functions.
Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
2015-11-23 12:22:59 -08:00
Sergio Giro
46972b2d82
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
...
Needed by AbstractVerifier in framework/base
DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56
Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
2015-11-23 15:46:15 +00:00
Chris Tate
984f548dca
Merge "Don\'t back up / restore EAP network definitions" am: 14a0981fde
...
am: b5a38f6da5
2015-11-20 18:10:22 +00:00
Chris Tate
b5a38f6da5
Merge "Don\'t back up / restore EAP network definitions"
...
am: 14a0981fde
2015-11-20 18:05:04 +00:00
Chris Tate
14a0981fde
Merge "Don't back up / restore EAP network definitions"
2015-11-20 18:01:10 +00:00
Geoff Mendal
829cf33ec4
Import translations. DO NOT MERGE am: bddde9b83d -s ours am: d0709c3a32 -s ours
...
am: 1bd58bfd5b
2015-11-20 01:30:38 +00:00
Geoff Mendal
1bd58bfd5b
Import translations. DO NOT MERGE am: bddde9b83d -s ours
...
am: d0709c3a32
2015-11-20 01:25:11 +00:00
Geoff Mendal
d0709c3a32
Import translations. DO NOT MERGE
...
am: bddde9b83d
2015-11-20 01:15:04 +00:00
Geoff Mendal
bddde9b83d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
2015-11-20 01:07:33 +00:00
Deepanshu Gupta
c29ac69d80
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
...
am: 35f7562495
2015-11-19 21:00:28 +00:00
Deepanshu Gupta
77c2432574
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
...
am: 8c971ae5a0
2015-11-19 20:58:56 +00:00
Deepanshu Gupta
35f7562495
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
2015-11-19 20:49:55 +00:00
Deepanshu Gupta
66098964e2
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
...
This reverts commit 65a834980c
2015-11-19 20:49:35 +00:00
Deepanshu Gupta
8c971ae5a0
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
2015-11-19 20:48:52 +00:00
Deepanshu Gupta
65a834980c
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
...
This reverts commit 631c2ffd6f
2015-11-19 20:47:26 +00:00
Sreeram Ramachandran
4a825ab3ca
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500 am: 6d983179a0
...
am: 5d41bd8d1a
2015-11-19 17:20:14 +00:00
Sreeram Ramachandran
5d41bd8d1a
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801 am: 974f805500
...
am: 6d983179a0
2015-11-19 17:10:45 +00:00
Sreeram Ramachandran
6d983179a0
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205 am: b776891801
...
am: 974f805500
2015-11-19 16:59:45 +00:00
Sreeram Ramachandran
974f805500
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790 am: 33c1718205
...
am: b776891801
2015-11-19 16:50:11 +00:00
Sreeram Ramachandran
b776891801
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7 am: d3b6e2d790
...
am: 33c1718205
2015-11-19 16:40:35 +00:00
Sreeram Ramachandran
33c1718205
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd am: 42faa221d7
...
am: d3b6e2d790
2015-11-19 16:30:59 +00:00
Sreeram Ramachandran
d3b6e2d790
Don\'t use framework permission strings for netd permissions. am: f1f45fe012 am: 0b542630dd
...
am: 42faa221d7
2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7
Don\'t use framework permission strings for netd permissions. am: f1f45fe012
...
am: 0b542630dd
2015-11-19 16:10:19 +00:00
Nicolas Geoffray
642c5da4f0
Merge "Update framework code after new ART options." am: d7d2817ade
...
am: 9da4055766
2015-11-19 16:05:04 +00:00
Sreeram Ramachandran
0b542630dd
Don\'t use framework permission strings for netd permissions.
...
am: f1f45fe012
2015-11-19 15:59:42 +00:00
Nicolas Geoffray
9da4055766
Merge "Update framework code after new ART options."
...
am: d7d2817ade
2015-11-19 15:54:21 +00:00
Nicolas Geoffray
d7d2817ade
Merge "Update framework code after new ART options."
2015-11-19 15:48:01 +00:00
Nicolas Geoffray
cdf1dfff8f
Update framework code after new ART options.
...
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
2015-11-19 14:31:23 +00:00
Christopher Tate
9bc2f472e9
Don't back up / restore EAP network definitions
...
Bug 25725016
Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
2015-11-18 13:42:04 -08:00
Andreas Gampe
e2c2eea6aa
Merge "Frameworks/base: Make RuntimeAbort more expressive" am: b61d3dd8a7
...
am: a7e9f174c1
2015-11-18 18:11:11 +00:00
Andreas Gampe
a7e9f174c1
Merge "Frameworks/base: Make RuntimeAbort more expressive"
...
am: b61d3dd8a7
2015-11-18 17:47:52 +00:00
Andreas Gampe
b61d3dd8a7
Merge "Frameworks/base: Make RuntimeAbort more expressive"
2015-11-18 17:16:59 +00:00
Sreeram Ramachandran
f1f45fe012
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a1204420f8f120839
2015-11-18 17:04:18 +00:00
