Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
299,673 Commits 3 Branches 0 Tags
acdb98a16c55c744056d58e257beb5a1df001a45
Commit Graph

299673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Karpinski
acdb98a16c DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO am: c4e7c32063 
am: 4c7693e121  -s ours

Change-Id: I80ecde75e69329ea91bccf410628a0fbb527a445
 2016-12-14 11:15:21 +00:00
Michal Karpinski
f69df7c044 DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users am: 504fa62f9e 
am: 8cfca9dbfe  -s ours

Change-Id: I1fb943dc37389894d974a57dd517ff96303abaf4
 2016-12-14 11:14:28 +00:00
Michal Karpinski
0843e2d14c DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called am: 5c64223da4 
am: a507f28143  -s ours

Change-Id: I8f0c4a62e3e4dcd2c9c6d4e59365e466e96da6ed
 2016-12-14 11:13:36 +00:00
Michal Karpinski
6443b08818 DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler am: 896b9db8ed 
am: eaaf9a1213  -s ours

Change-Id: If317b6570c39fca3060310de60119e42190d36e6
 2016-12-14 11:12:07 +00:00
Michal Karpinski
3d16ffbc67 DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times am: bbf352a2c1 
am: fd4ec31313  -s ours

Change-Id: I20cb5fe0d253337bda63dcfe1531cd14a79c1ec6
 2016-12-14 11:10:44 +00:00
Michal Karpinski
e4c4669158 DO NOT MERGE [DPM] Management and retrieval of network logs am: 4c47adef60 
am: d1c710d5cf  -s ours

Change-Id: I68dfff4f6d1619e76a43bc78caf84aaf4f4f8a40
 2016-12-14 11:09:45 +00:00
Michal Karpinski
e4f8b4eb2d DO NOT MERGE [DPM] DO can start network logging and listen for events am: c3abd34cfe 
am: b2e8690507  -s ours

Change-Id: I4fbfb006f8d5d398cae5e593fd4ce905b6c50f94
 2016-12-14 11:08:38 +00:00
Michal Karpinski
4c7693e121 DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO 
am: c4e7c32063

Change-Id: I64e032e5482cb917cb298fea578e157f7d9038d3
 2016-12-14 10:56:34 +00:00
Michal Karpinski
8cfca9dbfe DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users 
am: 504fa62f9e

Change-Id: I36bae185c96e9ee9f04d8e14654560803d2e89a1
 2016-12-14 10:55:45 +00:00
Michal Karpinski
a507f28143 DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called 
am: 5c64223da4

Change-Id: I37fabc41064e7fd0a1c42dab61697f74721e0beb
 2016-12-14 10:54:55 +00:00
Michal Karpinski
eaaf9a1213 DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler 
am: 896b9db8ed

Change-Id: I497a699c3137ef85c0ffd1c887bf8bd60600c182
 2016-12-14 10:53:30 +00:00
Michal Karpinski
fd4ec31313 DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times 
am: bbf352a2c1

Change-Id: I6df35873ec30044780fab02329bab327af8df161
 2016-12-14 10:52:18 +00:00
Andrei Stingaceanu
79ada3015b Merge "AutoSize TextView (part 4) - autosize when layout changes" 2016-12-14 10:51:56 +00:00
Michal Karpinski
d1c710d5cf DO NOT MERGE [DPM] Management and retrieval of network logs 
am: 4c47adef60

Change-Id: I39486c9d6116023f1ee9bd576b7fcd0fe20023a1
 2016-12-14 10:51:33 +00:00
Michal Karpinski
b2e8690507 DO NOT MERGE [DPM] DO can start network logging and listen for events 
am: c3abd34cfe

Change-Id: I7952d67d22a141040f3ee3ac2b6c3aa2cfccbbf7
 2016-12-14 10:50:36 +00:00
Lenka Trochtova
3c9c96d8dc Merge "DevicePolicyManager: make 3 hidden provisioning methods system API." 2016-12-14 09:22:02 +00:00
Ruben Brunk
86c2f957c3 Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev am: 3661a6f91b 
am: 7efe982f0f  -s ours

Change-Id: I1f14832ea52f8ebeb9982dfb1a1669b32c8a208e
 2016-12-14 08:34:27 +00:00
Ruben Brunk
3a9d3d1b23 Fix VR interaction with screen on/off/lockscreen. am: 040484cf90 
am: 1244608172  -s ours

Change-Id: If263f9abe66c283ec41e0c032ce2cd55e8345ca8
 2016-12-14 08:33:29 +00:00
Ruben Brunk
7efe982f0f Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev 
am: 3661a6f91b

Change-Id: I91f1912d21c5abd8d96130ee6037b2c08bc9df50
 2016-12-14 08:28:08 +00:00
Ruben Brunk
1244608172 Fix VR interaction with screen on/off/lockscreen. 
am: 040484cf90

Change-Id: I16023e2b02d9660b8c109c1586125316526f3fc9
 2016-12-14 08:27:58 +00:00
TreeHugger Robot
3661a6f91b Merge "Fix VR interaction with screen on/off/lockscreen." into nyc-mr2-dev 2016-12-14 08:22:33 +00:00
Erik Kline
c8e79632d0 Merge "Stop setting net.hostname" am: 06178a39f8 am: 35cc49e03f am: da70b6b287 
am: ee39ac1ceb

Change-Id: Id89ab1373d9cf633d9fae45131f18eabc200a8f9
 2016-12-14 08:21:04 +00:00
Erik Kline
ee39ac1ceb Merge "Stop setting net.hostname" am: 06178a39f8 am: 35cc49e03f 
am: da70b6b287

Change-Id: I9976537d761a761e9aeca5cb15298f689032664f
 2016-12-14 08:13:30 +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
TreeHugger Robot
165df02818 Merge "Fix VR interaction with screen on/off/lockscreen." 2016-12-14 05:23:42 +00:00
Lorenzo Colitti
a1d798923e Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev am: 5625d486b9 
am: bf21458740

Change-Id: I69e09d5e0b3e749ef069f7dff4c778209ee483de
 2016-12-14 05:06:51 +00:00
Lorenzo Colitti
68457bfc1e Display "Sign into network" in settings when on a captive portal. am: 1317e049f5 
am: 38938279a4

Change-Id: I3f836ff459850e48def89be69b6c7cda4986907b
 2016-12-14 05:05:54 +00:00
Lorenzo Colitti
bf21458740 Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev 
am: 5625d486b9

Change-Id: Iaec556477328fdf5e5f304a456c8942bca11592a
 2016-12-14 04:59:54 +00:00
Lorenzo Colitti
38938279a4 Display "Sign into network" in settings when on a captive portal. 
am: 1317e049f5

Change-Id: I9d15780cb49e365da98e09ba0149a8d31df4373c
 2016-12-14 04:59:47 +00:00
Lorenzo Colitti
5625d486b9 Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev 2016-12-14 04:48:41 +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
4539fb1884 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9 am: 94e328c22f am: 68700dc757 
am: 6ba22b5d19

Change-Id: I3b3cade76fa364899f7e177483b42020238bf691
 2016-12-14 03:42:47 +00:00
Erik Kline
6ba22b5d19 Merge "DHCPv4 anonymity profile: support skipping hostname option" am: eef38717b9 am: 94e328c22f 
am: 68700dc757

Change-Id: I7e587b8b45a722c085a1081321357b2f8e9e73c8
 2016-12-14 03:35:45 +00: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
76c9a0d2f4 Merge "Add an IPC for requesting network scores." 2016-12-14 03:20:06 +00:00
Treehugger Robot
eef38717b9 Merge "DHCPv4 anonymity profile: support skipping hostname option" 2016-12-14 03:07:48 +00:00
Ruben Brunk
dfe0d7157d Fix VR interaction with screen on/off/lockscreen. 
- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Test: Fix merge from nyc-mr2-dev.

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2
 2016-12-13 18:26:08 -08:00
Roozbeh Pournader
c9925480f1 Merge "Remove Droid Sans Fallback from all builds" 2016-12-14 01:38:17 +00:00
Ruben Brunk
040484cf90 Fix VR interaction with screen on/off/lockscreen. 
- Add mechanism to prevent VR mode from being enabled.
- Disable VR mode while screen is off, or user is in lockscreen,
  and re-enable when this is no longer the case.

Merged-In: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2

Bug: 31665197
Change-Id: Ia0a7fe8d443a24dce9395053cfe3d1c5847a88f2
 2016-12-13 17:32:21 -08:00
Adrian Roos
27014354cd Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev am: 3a39fe6bed 
am: 4d5c17c161

Change-Id: Ief1f66530cd73206f95d7680eb19f6e78f173534
 2016-12-14 01:14:07 +00:00
Adrian Roos
390a056474 Keyguard: Don't lock if SIM is NOT_READY am: e92de95261 
am: 6f65fad606

Change-Id: If7fdff7be0851bb3f6141ca0a5362d964c415f5d
 2016-12-14 01:13:05 +00:00
Adrian Roos
4d5c17c161 Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev 
am: 3a39fe6bed

Change-Id: I0049f95c59f929a7b5dd4beb88e9b67887a9dcce
 2016-12-14 01:07:08 +00:00
Adrian Roos
6f65fad606 Keyguard: Don't lock if SIM is NOT_READY 
am: e92de95261

Change-Id: I3aaaa7099c7b114606e90c62ed3376369b0d86d2
 2016-12-14 01:07:02 +00:00
Jeremy Joslin
b2087a159b Add an IPC for requesting network scores. 
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.

Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).

Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG: 33593157
Change-Id: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
 2016-12-13 17:06:56 -08:00
TreeHugger Robot
3a39fe6bed Merge "Keyguard: Don't lock if SIM is NOT_READY" into nyc-mr2-dev 2016-12-14 00:55:41 +00:00
Ruben Brunk
c32ebfb903 Merge "Prevent crash on uninstall." into nyc-mr2-dev am: f755dfb89e 
am: ea566a0687

Change-Id: If7f409779796fe419475fc58b71b49c9d473c9aa
 2016-12-14 00:42:47 +00:00
Ruben Brunk
58369e3d53 Prevent crash on uninstall. am: 12ab5e1d70 
am: a1501095cf

Change-Id: I62bbc3c8e228b6dcda8d8edcb22d29634cabf271
 2016-12-14 00:41:45 +00:00