Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
278,567 Commits 3 Branches 0 Tags
323f2dbc4677bde224afca004eeb5f5af9b156dc
Commit Graph

278567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius D'souza
323f2dbc46 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours am: 03c946e06b -s ours 
am: c2aed112a7  -s ours

Change-Id: Iac7c7e89a57c9e8717aa2fe9012b76595acbb2ea
 2016-12-14 18:15:28 +00:00
Julius D'souza
c2aed112a7 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours am: 10a9005003 -s ours 
am: 03c946e06b  -s ours

Change-Id: I75323469d9e15ea3b8652bb5f972d0e14a06cc7a
 2016-12-14 18:09:25 +00:00
Julius D'souza
03c946e06b DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours am: 495aa09cc6 -s ours 
am: 10a9005003  -s ours

Change-Id: I7a1d2d5b60b27765b2381e6d85fd3f8e967a40e1
 2016-12-14 18:03:26 +00:00
Julius D'souza
10a9005003 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours am: 589f83e686 -s ours 
am: 495aa09cc6  -s ours

Change-Id: I0f1a50fac9a6fc8a5c21b890aaa3aea5ea2aca74
 2016-12-14 17:56:53 +00:00
Julius D'souza
495aa09cc6 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. am: f9f39cc4a8 -s ours 
am: 589f83e686  -s ours

Change-Id: I76a619ed9824174735d0a86c55fe13a3d6e90ec5
 2016-12-14 17:51:28 +00:00
Julius D'souza
589f83e686 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController is going idle. 
am: f9f39cc4a8  -s ours

Change-Id: Ibd0b18a9e833afcc85845f4db57a927e80739cc2
 2016-12-14 17:44:27 +00:00
Marco Nelissen
8b1eed4ee8 Merge "Revert "Remove AmrInputStream"" am: e2d8581529 
am: 01cb199bed

Change-Id: Icafcabcc2b99dac4d897e0d68725c53e84fdd5c5
 2016-12-14 17:05:59 +00:00
Marco Nelissen
01cb199bed Merge "Revert "Remove AmrInputStream"" 
am: e2d8581529

Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
 2016-12-14 16:59:23 +00:00
Marco Nelissen
e2d8581529 Merge "Revert "Remove AmrInputStream"" 2016-12-14 16:44:47 +00:00
Marco Nelissen
a4efbf863b Revert "Remove AmrInputStream" 
This reverts commit 0c3518cc77.

Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
 2016-12-14 16:44:12 +00:00
Paul Duffin
b5f056068d Merge "Copy core-junit files into legacy-test." am: 69e363f506 
am: 884d3ca53b

Change-Id: I6d4a760fc740620578f324de6f847a3ec59600d5
 2016-12-14 15:10:30 +00:00
Paul Duffin
c3650beee5 Copy core-junit files into legacy-test. am: cd7c34d8bf 
am: 98e609d556

Change-Id: I4eb422f8fe217e5528e632d1f85c1303604b0d64
 2016-12-14 15:09:22 +00:00
Paul Duffin
884d3ca53b Merge "Copy core-junit files into legacy-test." 
am: 69e363f506

Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
 2016-12-14 15:02:20 +00:00
Paul Duffin
98e609d556 Copy core-junit files into legacy-test. 
am: cd7c34d8bf

Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
 2016-12-14 15:02:16 +00:00
Paul Duffin
69e363f506 Merge "Copy core-junit files into legacy-test." 2016-12-14 14:50:55 +00:00
Paul Duffin
cd7c34d8bf Copy core-junit files into legacy-test. 
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
 2016-12-14 14:19:08 +00:00
Paul Duffin
49a848e46f Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 
am: 5d53a925a1

Change-Id: I9239d238e51c61c6646022f64917348af27179ab
 2016-12-14 13:40:03 +00:00
Paul Duffin
b6421ce031 Copy junit-runner files into test-runner. am: eef35dd29a 
am: b46cecb6c4

Change-Id: I8f75a351d8e697b2fdbc4e1b3d06fd4ea25ffb0a
 2016-12-14 13:36:38 +00:00
Paul Duffin
5d53a925a1 Merge "Copy junit-runner files into test-runner." 
am: 3e24af3eb7

Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
 2016-12-14 13:35:44 +00:00
Paul Duffin
b46cecb6c4 Copy junit-runner files into test-runner. 
am: eef35dd29a

Change-Id: I974279917ae3451abf44143161ac945f4153768f
 2016-12-14 13:30:03 +00:00
Paul Duffin
3e24af3eb7 Merge "Copy junit-runner files into test-runner." 2016-12-14 13:22:40 +00:00
Paul Duffin
eef35dd29a Copy junit-runner files into test-runner. 
The android.test.runner target forms part of the Android API and
so must maintain backwards compatibility. The junit classes that
belong in there are copied here to ensure that they do not
change when external/junit is upgraded.

Bug: 30188076
Test: make checkbuild and checked android.test.runner contents
Change-Id: I947144c47ae1c3eb361a43c39bdd03dc11b9575f
 2016-12-14 10:41:05 +00:00
Erik Kline
da70b6b287 Merge "Stop setting net.hostname" am: 06178a39f8 
am: 35cc49e03f

Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23
 2016-12-14 08:07:01 +00:00
Erik Kline
35cc49e03f Merge "Stop setting net.hostname" 
am: 06178a39f8

Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
 2016-12-14 07:59:59 +00:00
Treehugger Robot
06178a39f8 Merge "Stop setting net.hostname" 2016-12-14 07:51:00 +00:00
Erik Kline
fc1b6a3f2a Stop setting net.hostname 
Test: as follows
    - basics:
        - built
        - flashed
        - booted
    - connect to {v4-only, dualstack, v6-only} networks
        - verified expected connectivity on each
    - runtest frameworks-net
Bug: 30979015

Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f
 2016-12-14 13:11:15 +09:00
Erik Kline
68700dc757 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9 
am: 94e328c22f

Change-Id: I4d46a9aa4b601098e55bf681906cb245d4d9a5cb
 2016-12-14 03:29:10 +00:00
Erik Kline
94e328c22f Merge "DHCPv4 anonymity profile: support skipping hostname option" 
am: eef38717b9

Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939
 2016-12-14 03:22:12 +00:00
Treehugger Robot
eef38717b9 Merge "DHCPv4 anonymity profile: support skipping hostname option" 2016-12-14 03:07:48 +00:00
Julius D'souza
f9f39cc4a8 DO NOT MERGE ANYWHERE: Hold a wake lock while DeviceIdleController 
is going idle.

The inputs to DeviceIdleController (alarm manager, sensors)
hold wake locks while they call it.  But then the real work
happens in a handler which is outside of the wakelock, so
listeners don't get a chance to run right away, which in
the case of NetworkPolicyManager means the device is in a
higher power state than it should be.

It's not clear that this will 100% fix the bug, because
NetworkPolicyManagerService also has its own internal
Handler, and isn't holding its own wakelock for this,
but this change allows NPMS to be fixed if it really
needed to be.

Bug: 31900521
Change-Id: I706045aa189147824c9214c57abc13993aee9a5b
 2016-12-13 18:28:31 -08:00
Marco Nelissen
b10837952a Merge "Remove AmrInputStream" am: 70b262b0f2 
am: e57b37e423

Change-Id: Ia95832144e831b91ba0f163db1da8ef8e7033446
 2016-12-13 23:28:55 +00:00
Marco Nelissen
e57b37e423 Merge "Remove AmrInputStream" 
am: 70b262b0f2

Change-Id: I46f8cf7847982e8ab590c9016472fea93aa4a27b
 2016-12-13 23:22:14 +00:00
Marco Nelissen
70b262b0f2 Merge "Remove AmrInputStream" 2016-12-13 23:09:21 +00:00
Marco Nelissen
0c3518cc77 Remove AmrInputStream 
Bug: 32114618
Change-Id: I55328e6f003377f4d3c2ba2266844047b1422f49
 2016-12-13 13:31:10 -08:00
Ivan Podogov
4d2c60173e Merge changes from topic 'f-radio-toggle' into cw-f-dev 
am: e5592abb83

Change-Id: I9b6e01eedbbd463e0053bab3a5b8a080aaf7514a
 2016-12-13 19:46:45 +00:00
Svetoslav Ganov
4c63779d4b Add WiFi toggle prompts - framework 
am: 82737b42a6

Change-Id: I5767478779bf20ad854a0992b73b3cd72737504c
 2016-12-13 19:46:20 +00:00
Ivan Podogov
903d6414e5 resolve merge conflicts of b1e2da7 to nyc-mr1-dev-plus-aosp 
Test: build police
Change-Id: Ifec1ab6760ebb94b0b411c9c60f07066e151206b
 2016-12-13 17:55:14 +00:00
Jeremy Joslin
eb0a34f26b Merge "Make the onRequestRecommendation() method async." am: fbeacb02c0 
am: a6c6bc333d

Change-Id: I56a830273f8e3246b598c2ea7a027b87e3066e16
 2016-12-13 16:19:14 +00:00
Jeremy Joslin
a6c6bc333d Merge "Make the onRequestRecommendation() method async." 
am: fbeacb02c0

Change-Id: I9b98480499c2366eee06de163b561c4583e475d2
 2016-12-13 16:13:44 +00:00
Treehugger Robot
fbeacb02c0 Merge "Make the onRequestRecommendation() method async." 2016-12-13 16:04:36 +00:00
Ivan Podogov
e5592abb83 Merge changes from topic 'f-radio-toggle' into cw-f-dev 
* changes:
  Add WiFi toggle prompts - framework
  Add Bluetooth toggle prompts - framework
 2016-12-13 15:55:30 +00:00
Tobias Thierer
cd6720274d Merge "API changes for updating Locale to OpenJDK8u60, part 2" am: c35137ce36 
am: 7de23e292f

Change-Id: Id25c5050bb798ec206e86a83260a3bee9510e52c
 2016-12-13 13:48:39 +00:00
Tobias Thierer
7de23e292f Merge "API changes for updating Locale to OpenJDK8u60, part 2" 
am: c35137ce36

Change-Id: Ibbf80ffe75bdbbc5da343e139bd80bc70afe4794
 2016-12-13 13:42:50 +00:00
Tobias Thierer
c35137ce36 Merge "API changes for updating Locale to OpenJDK8u60, part 2" 2016-12-13 13:36:08 +00:00
Erik Kline
511818ffb3 DHCPv4 anonymity profile: support skipping hostname option 
Per https://tools.ietf.org/html/rfc7844#section-3.7

   When using the anonymity profile, DHCP clients SHOULD NOT send the
   Host Name option.

Once the net.hostname property is removed and ensured unset via CTS
this option will no longer be sent.

Test: as follows
    - build, flashed
    - connected to v4-only and dualstack networks, verified v4 works
    - android.net.dhcp.DhcpPacketTest passes
    - setprop net.hostname "" and verified no hostname option
Bug: 30979015
Change-Id: Ieab3f04ea38e176d9147bb788742a5397762c2e4
 2016-12-13 18:14:44 +09:00
sghuman
b2f7005f07 Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." am: a895081335 
am: 9b2760dbe5

Change-Id: Ia4c873cc5425175b86f909b6aa3798074521467a
 2016-12-13 02:29:14 +00:00
Sundeep Ghuman
c600c4058b Copy WifiNetworkScoreCache into frameworks/base. Add tests. am: 46169f946b 
am: e436024c65

Change-Id: I9f9310feaa19385bb9287c959c2f2d3a9642e3b9
 2016-12-13 02:23:42 +00:00
sghuman
9b2760dbe5 Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." 
am: a895081335

Change-Id: I779eabea94d67d01ac29b49a68456daf9dd19013
 2016-12-13 02:23:15 +00:00
Sundeep Ghuman
e436024c65 Copy WifiNetworkScoreCache into frameworks/base. Add tests. 
am: 46169f946b

Change-Id: Id3ce970efaea32d0d0a2fa5594b91628e2f3d1df
 2016-12-13 02:18:21 +00:00
sghuman
a895081335 Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests." 2016-12-13 02:08:39 +00:00