OSDN Git Service
xin He [Wed, 13 Jan 2016 20:03:50 +0000 (20:03 +0000)]
Merge "Initial codes for Quality network selection [DO NOT MERGE]" into mm-wireless-dev
xinhe [Tue, 1 Dec 2015 22:44:37 +0000 (14:44 -0800)]
Initial codes for Quality network selection [DO NOT MERGE]
In this change list, the old WifiAutojoin module is
refactored initially. The old WifiAutojoinController is
replaced with a new WifiQualifiedNetworkSelector.
WifiConfiguration, WifiConfigureStore and
WifiStateMachine have been modified accordingly. The new
network selection logic is refactored with a more clear
and deterministci one. To refer to thedescribed in
details, in "Quality Network Selection and Connectivity
Scan Management in N". The link of the document is:
https://docs.google.com/document/d
/1JPTa2NEk-PgjCJ16fIrR6ohV-kDKveDlYDOeiMCB2_c
Bug:
26012244
Change-Id: I3df124c110e458e3b6bc29466b9046748d79582a
Amit Mahajan [Tue, 12 Jan 2016 23:43:36 +0000 (15:43 -0800)]
Added constructor with looper param for OnSubscriptionsChangedListener
This is needed for tests as subclasses may need to specify which
looper to use.
Bug:
25691379
Change-Id: Ia6eb2d34c439b420ef81622e3c8ff50a0290da22
Tyler Gunn [Fri, 23 Oct 2015 21:39:49 +0000 (14:39 -0700)]
[DO NOT MERGE] Add "acceptRingingCall()" API which accepts a videoState.
- Added acceptRingingCall API which accepts a videostate to complement the
existing API.
Bug:
20159300
Change-Id: I2a9d53fd4dbbb0be49d95416f7e26d3ec61774cd
Jack Yu [Mon, 4 Jan 2016 18:04:34 +0000 (10:04 -0800)]
Fixed the incorrect cdma RAT detection logic.
Used the correct CDMA bitmask to determine if the bearer services
are based on 3GPP2 radio technologies.
bug:
26318528
Change-Id: Ic30c25aa7b67372898a041dd1f3a08a3abede394
Jack Yu [Wed, 30 Dec 2015 20:06:01 +0000 (12:06 -0800)]
Reduced the radio log
Reduced the radio log by moving some to VDBG or merging few lines
into one.
bug:
25956251
Change-Id: I290d894e95c9fdd664db35fd0cee3536c37dbd20
Randy Pan [Thu, 17 Dec 2015 21:07:07 +0000 (13:07 -0800)]
Correct WiFi exponential back off scan
Correct the comments for exponential back off scan. Only binary
exponential back off scan is supported.
Updated the API doc. A couple of un-related fields which were
not updated get updated as well.
Bug:
26236392
Change-Id: I5668092f393b564aa40904ed609a51aa16890614
Robert Greenwalt [Fri, 4 Dec 2015 19:51:49 +0000 (11:51 -0800)]
Check permissions on getDeviceId. DO NOT MERGE
This needs the package name passed in, so the aidl changes.
bug:
25778215
Change-Id: I69ee88f1d2db614bad51e6de908d3f16881a0231
Tyler Gunn [Wed, 9 Dec 2015 23:00:18 +0000 (15:00 -0800)]
DO NOT MERGE Add PhoneAccount capability to indicate if VT uses presence.
Added new PhoneAccount capability used to indicate whether the dialer
should use the presence bit in the contacts provider to determine when
the video call icon is shown or not.
Bug:
20257833
Change-Id: Ifb3cc5b7ff1090d539dfb925dce9f6327de15c46
Prerepa Viswanadham [Thu, 10 Dec 2015 00:12:08 +0000 (16:12 -0800)]
WLAN wake reason accounting from driver.
Change-Id: I58e0594682bf0f1d5746e9a2d8ec3091a5bf550f
Baligh Uddin [Sun, 13 Dec 2015 18:01:17 +0000 (18:01 +0000)]
empty commit to trigger build
Change-Id: I3ec926126a0d9ee7d64ffc70ca7aa7c6c9e2a9c6
Tyler Gunn [Fri, 11 Dec 2015 04:05:46 +0000 (20:05 -0800)]
Merge commit '
da131290ae5e476691e05e5eb4ac6d507012a0ac' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:04:25 +0000 (20:04 -0800)]
Merge commit '
9aadad47a0085c4298307781a423064207933f0b' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:04:17 +0000 (20:04 -0800)]
Merge commit '
70da83381f77e0ee9ada47eafaae395038ff77ad' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:03:24 +0000 (20:03 -0800)]
Merge commit '
bc4da97ce0fcd0ddef228048bc663e383776c323' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:03:15 +0000 (20:03 -0800)]
Merge commit '
5e42c1cf1c7786a550df351622865ba1710a0ea6' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:03:00 +0000 (20:03 -0800)]
Merge commit '
d40a83543a67a911b5dcfbb8d164cea0c5285a78' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:02:51 +0000 (20:02 -0800)]
Merge commit '
3132d0c9f894707043c07622fae7b33c85ea0013' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:02:38 +0000 (20:02 -0800)]
Merge commit '
73831680cd7e47df103cf60a2230ed411e5d3b93' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:02:29 +0000 (20:02 -0800)]
Merge commit '
c956f0dcb3d93dd0f3ee0a3daafaf2da8212402e' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 04:02:16 +0000 (20:02 -0800)]
Merge commit '
024557b2afdbe2e946d2cc557cb71492d87b0f62' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Change-Id: I44853f0e2f56d33c8126de0799bd5129799592bd
Tyler Gunn [Fri, 11 Dec 2015 03:59:27 +0000 (19:59 -0800)]
Merge commit '
98bd72181e176cdc5536b9709127a71cca082bbf' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 03:57:22 +0000 (19:57 -0800)]
Merge commit '
109e9c449d5a0070df793c63383e474a03242ba5' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 03:56:01 +0000 (19:56 -0800)]
Merge commit '
f231ca1c67f3925d018265f99f5b8a691d190d68' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 03:55:50 +0000 (19:55 -0800)]
Merge commit '
6cb5fcaad143227002bd4d00b1974e126d9a8090' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Tyler Gunn [Fri, 11 Dec 2015 03:55:41 +0000 (19:55 -0800)]
Merge commit '
b19c0041914019e6d9d96fce67ec0e7a6820bf3c' into mncvtdev-to-mmwirelessdev-merge-2015-12-10
Jack Yu [Fri, 11 Dec 2015 01:07:24 +0000 (01:07 +0000)]
Merge "merge from master" into mm-wireless-dev
Lorenzo Colitti [Sun, 22 Nov 2015 13:00:08 +0000 (22:00 +0900)]
DO NOT MERGE Don't crash when canceling alarms if a direct listener is present
If a direct listener alarm attempts to match a regular
PendingIntent alarm, it will attempt to fetch the binder of the
regular alarm's direct listener, which is null, and crash the
system with an NPE.
Cherry-picked from
9b43ce0c98ce9f865d6db547529d098c8982cc
Bug:
25823676
Change-Id: I85fb98b43436930a2513274dc5ab408f7d41d97f
Christopher Tate [Thu, 1 Oct 2015 17:24:31 +0000 (10:24 -0700)]
DO NOT MERGE Introduce direct listener API for alarm delivery
The Alarm Manager now supports a set() variant that takes a listener
callback to invoke at alarm trigger time rather than a PendingIntent.
This is much lower overhead and has guaranteed low delivery latency
from the trigger time. The tradeoff is that the app must be running
*continuously* from the time the alarm is set to the time it is
delivered. If the app exits for any reason before the alarm fires,
the listener becomes invalid and the alarm will be dropped. This is
more or less equivalent to setting an alarm with a broadcast
PendingIntent that matches only a runtime-registered receiver.
The app's alarm listener can be any object that implements the new
AlarmManager.OnAlarmListener interface and implements its onAlarm()
method. There is no data delivered at alarm trigger time: whatever
state needs to be associated with the specific alarm instance should
simply be packaged inside the OnAlarmListener instance.
An alarm using OnAlarmListener can request that the onAlarm() method
be called on an arbitrary handler. If the program passes 'null' for
this parameter when setting the alarm, the callback occurs on the
application's main Looper thread.
Cherry-picked from
14a7bb0d370fffdf902a4e2345f46754ed2d7684
Bug
20157436
Change-Id: I2eb030a24efdd466a2eee1666c5231201b43684b
Dianne Hackborn [Mon, 26 Oct 2015 20:33:20 +0000 (13:33 -0700)]
DO NOT MERGE Add some debugging for device idle alarms.
Cherry-picked from
ae78bf8552d0a3ff83b8300630d47188434173ea
Change-Id: I6792f0ffc5cc40af5ec35cb03ab78b52c17678fd
Erik Kline [Mon, 10 Aug 2015 04:28:50 +0000 (13:28 +0900)]
DO NOT MERGE Refactor netlink and IpReachabilityMonitor into services/net
- netlink from core to services/net/netlink
- IpReachabilityMonitor from core to services/net/ip
Cherry-picked from
02cc5a030a6f132e776b754dd5684ae632009f76
Change-Id: I45ac3f591bade45dd5ec441111b02b621234c0e4
Chad Brubaker [Wed, 9 Sep 2015 21:53:52 +0000 (14:53 -0700)]
DO NOT MERGE Allow uid to be passed for more operations
This expands get, getmtime, exportKey, getKeyCharacteristcs and begin to
accept a uid to run as. This is only for system to use keys owned by
Wifi and VPN, and not something that can be used to do operations as
another arbitrary application.
Cherry-picked from
5bbf04803f050296a6deab10a3c7104743c4e38c
Bug:
23978113
Change-Id: I06aa089859edc934a5415e3b184b917d6d171ae2
Alex Klyubin [Wed, 9 Sep 2015 21:55:03 +0000 (14:55 -0700)]
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
3876b1be27e3aefde9a72eb2e4f856e94fc5f946
Bug:
23978113
Change-Id: Ie381530f41dc41c50d52f675fb9e68bc87c006de
Mitchell Wills [Mon, 16 Nov 2015 22:23:59 +0000 (14:23 -0800)]
DO NOT MERGE Expose gscan exponential backoff API
Will be ignored until scan scheduling supports it
Cherry-picked from
2564d9a4efb2f3a44dac5ae1e5e437e5355d19cf
Change-Id: I9d392080e6ec8dfa9a998f6c04ec37f9c6dad0b2
Mitchell Wills [Tue, 28 Jul 2015 16:56:53 +0000 (09:56 -0700)]
DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class
Cherry-picked from
97c46ef28632f275665384d64cf42b698ca70255
Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
Mitchell Wills [Wed, 7 Oct 2015 01:16:06 +0000 (18:16 -0700)]
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
88d93cd68a32e7110f9328ff522226126c7e493e
Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
Mitchell Wills [Tue, 22 Sep 2015 22:30:08 +0000 (15:30 -0700)]
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
3d1933c45fe9ba2389ebd166d96abeceab1971d1
Cherry-picked from
f9a80cbbfe5585772ea16fddfeb728c74bc04b2d
Change-Id: I9d609f7a0f82755ea653a205293a6e3785a10d1e
Mitchell Wills [Tue, 1 Sep 2015 19:21:59 +0000 (12:21 -0700)]
DO NOT MERGE Don't cache ScanResults in WifiTracker if there is no SSID
Cherry-picked from
9df79043907870fd4c1bd30b460b138169b92bbf
Bug:
23528076
Change-Id: I118cfafb526fe760bf1d545e09a1559e3867ce06
Mitchell Wills [Tue, 25 Aug 2015 20:44:07 +0000 (13:44 -0700)]
DO NOT MERGE Add missing ap threshold config for hotlists
Cherry-picked from
ff4fdceafe4646998629587248fff22400f44765
Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
Mitchell Wills [Tue, 18 Aug 2015 00:16:22 +0000 (17:16 -0700)]
DO NOT MERGE Check if link stats are supported when reporting activity info
Cherry-picked from
9a568e6f2f69cc923bbfc1ffb07c2f194acdb981
Bug:
23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
Mitchell Wills [Thu, 6 Aug 2015 00:10:25 +0000 (17:10 -0700)]
DO NOT MERGE Remove driver stop delay config as it is no longer used
Cherry-picked from
a4c1f6f0618d709ab05d7545fce663a6b2803bc4
Bug:
22808676
Change-Id: I5c29a6d024cc34514876e56a349b496a2f734c8f
Jan Nordqvist [Tue, 22 Sep 2015 22:54:32 +0000 (15:54 -0700)]
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
52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
Vinit Deshpande [Thu, 12 Nov 2015 22:45:15 +0000 (14:45 -0800)]
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
794395465b6a785d313ea1018ed37bf3bb8c3978
Jack Yu [Thu, 10 Dec 2015 20:27:58 +0000 (12:27 -0800)]
merge from master
Change-Id: Ic03669db3f4595336a7dbc13ffc77d055d11acf9
Jim Kaye [Tue, 24 Nov 2015 19:42:15 +0000 (19:42 +0000)]
Merge "Extend the \'qwerty\' key layout" am:
9a83f115ad
am:
e579edc76b
* commit '
e579edc76b6f3f8c977d96db6af01d73e6c93804':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:33:57 +0000 (19:33 +0000)]
Merge "Extend the \'qwerty\' key layout"
am:
9a83f115ad
* commit '
9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:27:46 +0000 (19:27 +0000)]
Merge "Extend the 'qwerty' key layout"
Sergio Giro [Tue, 24 Nov 2015 15:51:14 +0000 (15:51 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am:
d5a5d547d0
am:
d9942006e4
* commit '
d9942006e4a45884fffda8e5888d9657f40b48d2':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 15:43:06 +0000 (15:43 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am:
d5a5d547d0
* commit '
d5a5d547d05eee9d626db1d7977c11acbf83b0c7':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
Jim Kaye [Mon, 23 Nov 2015 20:22:59 +0000 (12:22 -0800)]
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
Sergio Giro [Mon, 23 Nov 2015 15:14:52 +0000 (15:14 +0000)]
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
Chris Tate [Fri, 20 Nov 2015 18:10:22 +0000 (18:10 +0000)]
Merge "Don\'t back up / restore EAP network definitions" am:
14a0981fde
am:
b5a38f6da5
* commit '
b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:05:04 +0000 (18:05 +0000)]
Merge "Don\'t back up / restore EAP network definitions"
am:
14a0981fde
* commit '
14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Don't back up / restore EAP network definitions"
Geoff Mendal [Fri, 20 Nov 2015 01:30:38 +0000 (01:30 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours
am:
1bd58bfd5b -s ours
* commit '
1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours
am:
d0709c3a32 -s ours
* commit '
d0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am:
bddde9b83d -s ours
* commit '
bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
Deepanshu Gupta [Thu, 19 Nov 2015 21:00:28 +0000 (21:00 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
am:
35f7562495
* commit '
35f75624958bc061764c7cc71843ca7ea60c0666':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 20:58:56 +0000 (20:58 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
am:
8c971ae5a0
* commit '
8c971ae5a0d294175481426d4543e23dc8d4a349':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:55 +0000 (20:49 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:35 +0000 (20:49 +0000)]
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
This reverts commit
65a834980cdbb9407a3f27e48cd0a8c472182cd6.
The original revert was only for cherry-pick to release
branch.
Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
Deepanshu Gupta [Thu, 19 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:47:26 +0000 (20:47 +0000)]
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit
631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.
The revert is only for cherry-pick back to mnc-sdk-release.
Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
Sreeram Ramachandran [Thu, 19 Nov 2015 17:20:14 +0000 (17:20 +0000)]
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
* commit '
5d41bd8d1acd894cef1aff9018614194df6f95ab':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 17:10:45 +0000 (17:10 +0000)]
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
* commit '
6d983179a047ff0e69fc06c06d3b9b06c32406ae':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:59:45 +0000 (16:59 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801
am:
974f805500
* commit '
974f8055005a3d75e45cab89badd9ef183a75107':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:50:11 +0000 (16:50 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205
am:
b776891801
* commit '
b7768918014d34c2e4d74abefeb03956aee421fc':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790
am:
33c1718205
* commit '
33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7
am:
d3b6e2d790
* commit '
d3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd
am:
42faa221d7
* commit '
42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012
am:
0b542630dd
* commit '
0b542630dd8b4d43f2e4f70563d3e44bb680455f':
Don't use framework permission strings for netd permissions.
Nicolas Geoffray [Thu, 19 Nov 2015 16:05:04 +0000 (16:05 +0000)]
Merge "Update framework code after new ART options." am:
d7d2817ade
am:
9da4055766
* commit '
9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
f1f45fe012
* commit '
f1f45fe012ddbd516e797099994c400a1cac8581':
Don't use framework permission strings for netd permissions.
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am:
d7d2817ade
* commit '
d7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
Andreas Gampe [Wed, 18 Nov 2015 18:11:11 +0000 (18:11 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive" am:
b61d3dd8a7
am:
a7e9f174c1
* commit '
a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am:
b61d3dd8a7
* commit '
b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
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
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
0f8f120839120da543ee186cf25ce6e215423e99)
Nicolas Geoffray [Wed, 18 Nov 2015 11:05:23 +0000 (11:05 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0
am:
5485d81578
* commit '
5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
cf49583bd0
* commit '
cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Thu, 5 Nov 2015 11:29:42 +0000 (11:29 +0000)]
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit
9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
Andreas Gampe [Wed, 18 Nov 2015 00:38:59 +0000 (16:38 -0800)]
Frameworks/base: Make RuntimeAbort more expressive
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."
Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
Diego Perez [Tue, 17 Nov 2015 22:43:16 +0000 (22:43 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev
am:
603544d4c4
* commit '
603544d4c42cd8e0cc46da04f28a8fead64665e3':
Fix delegation of methods within inner static classes
Joe LaPenna [Tue, 17 Nov 2015 22:41:49 +0000 (22:41 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am:
f2b9b2d85a
am:
f7aceb60e3
* commit '
f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c':
Revert "Don't dispatch when non-interactive and the display is off."
Stephen Hines [Tue, 17 Nov 2015 22:37:35 +0000 (22:37 +0000)]
Merge "Remove unsupported RS graphics API tests." am:
7ea808b177
am:
5a0a713147
* commit '
5a0a713147a76195ae21d53d065633f117271793':
Remove unsupported RS graphics API tests.
Diego Perez [Tue, 17 Nov 2015 22:34:08 +0000 (22:34 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev
Joe LaPenna [Tue, 17 Nov 2015 22:32:57 +0000 (22:32 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off."
am:
f2b9b2d85a
* commit '
f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
Revert "Don't dispatch when non-interactive and the display is off."
Stephen Hines [Tue, 17 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Remove unsupported RS graphics API tests."
am:
7ea808b177
* commit '
7ea808b17736f690eb8d23729f33e9a612b0492c':
Remove unsupported RS graphics API tests.
Joe LaPenna [Tue, 17 Nov 2015 22:22:37 +0000 (22:22 +0000)]
Revert "Don't dispatch when non-interactive and the display is off."
This reverts commit
2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.
BUG:
22422588
BUG:
25067918
Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
Stephen Hines [Tue, 17 Nov 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Remove unsupported RS graphics API tests."
Michael Wright [Tue, 17 Nov 2015 21:37:25 +0000 (21:37 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506 am:
08ed2bc083 am:
41ef58be3e
am:
8aa7e6a21a
* commit '
8aa7e6a21a3428741159de2e28d87acb8b420e96':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 21:18:16 +0000 (21:18 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506 am:
08ed2bc083
am:
41ef58be3e
* commit '
41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
DO NOT MERGE. Prevent recents from coming up when in SUW
Chad Brubaker [Tue, 17 Nov 2015 21:18:12 +0000 (21:18 +0000)]
Merge "Add NetworkSecurityConfigProvider.install" am:
08181cf647
am:
97f92ce41e
* commit '
97f92ce41e66b54e56733f18bdaae056f08c0ae7':
Add NetworkSecurityConfigProvider.install
Michael Wright [Tue, 17 Nov 2015 20:59:42 +0000 (20:59 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506
am:
08ed2bc083
* commit '
08ed2bc083fe142ea6f89f97172543327f423e61':
DO NOT MERGE. Prevent recents from coming up when in SUW