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

213427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mitchell Wills
21c748d091 DO NOT MERGE Moved Wifi InformationElement parsing to a common utility class 
Cherry-picked from 97c46ef28632f275665384d64cf42b698ca70255
Change-Id: Iaa0cfc39ac4df375f80f01cf59eb5f0d0ae61879
 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 88d93cd68a32e7110f9328ff522226126c7e493e
Change-Id: I36ffef137d0620263278e5ef46bbc498a39c588f
 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 3d1933c45fe9ba2389ebd166d96abeceab1971d1

Cherry-picked from f9a80cbbfe5585772ea16fddfeb728c74bc04b2d
Change-Id: I9d609f7a0f82755ea653a205293a6e3785a10d1e
 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 9df79043907870fd4c1bd30b460b138169b92bbf
Bug: 23528076
Change-Id: I118cfafb526fe760bf1d545e09a1559e3867ce06
 2015-12-10 16:06:50 -08:00
Mitchell Wills
5374e36bb5 DO NOT MERGE Add missing ap threshold config for hotlists 
Cherry-picked from ff4fdceafe4646998629587248fff22400f44765
Change-Id: I9e31e72560840ea57ab191e820acf8e3faf00c36
 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 9a568e6f2f69cc923bbfc1ffb07c2f194acdb981
Bug: 23286362
Change-Id: I42c91d488acd39341a6874797788d3e5357f0270
 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 a4c1f6f0618d709ab05d7545fce663a6b2803bc4
Bug: 22808676
Change-Id: I5c29a6d024cc34514876e56a349b496a2f734c8f
 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 52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
 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 794395465b6a785d313ea1018ed37bf3bb8c3978
 2015-12-10 22:10:32 +00:00
Jim Kaye
8366fdd6a8 Merge "Extend the \'qwerty\' key layout" am: 9a83f115ad 
am: e579edc76b

* commit 'e579edc76b6f3f8c977d96db6af01d73e6c93804':
  Extend the 'qwerty' key layout
 2015-11-24 19:42:15 +00:00
Jim Kaye
e579edc76b Merge "Extend the \'qwerty\' key layout" 
am: 9a83f115ad

* commit '9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
  Extend the 'qwerty' key layout
 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

* commit 'd9942006e4a45884fffda8e5888d9657f40b48d2':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
 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

* commit 'd5a5d547d05eee9d626db1d7977c11acbf83b0c7':
  ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
 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

* commit 'b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
  Don't back up / restore EAP network definitions
 2015-11-20 18:10:22 +00:00
Chris Tate
b5a38f6da5 Merge "Don\'t back up / restore EAP network definitions" 
am: 14a0981fde

* commit '14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
  Don't back up / restore EAP network definitions
 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  -s ours

* commit '1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
  Import translations. DO NOT MERGE
 2015-11-20 01:30:38 +00:00
Geoff Mendal
1bd58bfd5b Import translations. DO NOT MERGE am: bddde9b83d -s ours 
am: d0709c3a32  -s ours

* commit 'd0709c3a329ce555d9d968bc1808fec5bcc1fb10':
  Import translations. DO NOT MERGE
 2015-11-20 01:25:11 +00:00
Geoff Mendal
d0709c3a32 Import translations. DO NOT MERGE 
am: bddde9b83d  -s ours

* commit 'bddde9b83db2bab9343cbe107d3672fea5314d4b':
  Import translations. DO NOT MERGE
 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

* commit '35f75624958bc061764c7cc71843ca7ea60c0666':
  Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
 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

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
 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 65a834980cdbb9407a3f27e48cd0a8c472182cd6.


The original revert was only for cherry-pick to release
branch.

Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
 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 631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.

The revert is only for cherry-pick back to mnc-sdk-release.

Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
 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

* commit '5d41bd8d1acd894cef1aff9018614194df6f95ab':
  Don't use framework permission strings for netd permissions.
 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

* commit '6d983179a047ff0e69fc06c06d3b9b06c32406ae':
  Don't use framework permission strings for netd permissions.
 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

* commit '974f8055005a3d75e45cab89badd9ef183a75107':
  Don't use framework permission strings for netd permissions.
 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

* commit 'b7768918014d34c2e4d74abefeb03956aee421fc':
  Don't use framework permission strings for netd permissions.
 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

* commit '33c17182058ce0f9d0bae48467827ff52422cdd2':
  Don't use framework permission strings for netd permissions.
 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

* commit 'd3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
  Don't use framework permission strings for netd permissions.
 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

* commit '42faa221d7e8bc6db32698b3528e9c5898dbb943':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:20:26 +00:00
Sreeram Ramachandran
42faa221d7 Don\'t use framework permission strings for netd permissions. am: f1f45fe012 
am: 0b542630dd

* commit '0b542630dd8b4d43f2e4f70563d3e44bb680455f':
  Don't use framework permission strings for netd permissions.
 2015-11-19 16:10:19 +00:00
Nicolas Geoffray
642c5da4f0 Merge "Update framework code after new ART options." am: d7d2817ade 
am: 9da4055766

* commit '9da4055766fc7acf81dcd238204589ea1f484d50':
  Update framework code after new ART options.
 2015-11-19 16:05:04 +00:00
Sreeram Ramachandran
0b542630dd Don\'t use framework permission strings for netd permissions. 
am: f1f45fe012

* commit 'f1f45fe012ddbd516e797099994c400a1cac8581':
  Don't use framework permission strings for netd permissions.
 2015-11-19 15:59:42 +00:00
Nicolas Geoffray
9da4055766 Merge "Update framework code after new ART options." 
am: d7d2817ade

* commit 'd7d2817ade8459a8f6872ff814d3208613502858':
  Update framework code after new ART options.
 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

* commit 'a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
  Frameworks/base: Make RuntimeAbort more expressive
 2015-11-18 18:11:11 +00:00
Andreas Gampe
a7e9f174c1 Merge "Frameworks/base: Make RuntimeAbort more expressive" 
am: b61d3dd8a7

* commit 'b61d3dd8a773be393c738675cff28fc799497535':
  Frameworks/base: Make RuntimeAbort more expressive
 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 a120442.

Bug: 21900139
Bug: 18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit 0f8f120839120da543ee186cf25ce6e215423e99)
 2015-11-18 17:04:18 +00:00
Nicolas Geoffray
4e390fa8e6 Merge "Remove DEBUG_JIT from Zygote flags." am: cf49583bd0 
am: 5485d81578

* commit '5485d815788e4037829d70d041fe4fc1a35416f3':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 11:05:23 +00:00
Nicolas Geoffray
5485d81578 Merge "Remove DEBUG_JIT from Zygote flags." 
am: cf49583bd0

* commit 'cf49583bd02d01b5d7aa57912d5469b466722c65':
  Remove DEBUG_JIT from Zygote flags.
 2015-11-18 10:54:19 +00:00