Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
301,953 Commits 3 Branches 0 Tags
ec4e0b075f53ac83cb03db07c00a67ea0f1e3a34
Commit Graph

301953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Charles He
71d2a41dd9 Add @GuardedBy annotation to PersistentDataBlockService#mIsWritable. 
Change-Id: I1024f2a56badde5c123d025d6fe02f42559cbcb1
Test: manual
Bug: 30352311
(cherry picked from commit f6f1d62748)
 2016-12-14 13:28:55 +00:00
Paul Duffin
3e24af3eb7 Merge "Copy junit-runner files into test-runner." 2016-12-14 13:22:40 +00:00
Charles He
a9437bd1ca Prevent writing to FRP partition during factory reset. 
Avoid potential race condition between FRP wipe and write operations
during factory reset by making the FRP partition unwritable after
wipe.

Bug: 30352311
Test: manual
Change-Id: If3f024a1611366c0677a996705724458094fcfad
(cherry picked from commit a629c772f4)
 2016-12-14 12:08:30 +00:00
Erik Kline
c30cdf89fe Merge "More correct startup and shutdown procedures." into nyc-mr2-dev am: c8059fb94c 
am: 208336e710

Change-Id: I1385649a71bdba3f19fd863bd4a3ace66d56b568
 2016-12-14 11:47:22 +00:00
Erik Kline
fdce10985c More correct startup and shutdown procedures. am: 6c0782f1ae 
am: 20cad0821d

Change-Id: I5096f6a6f3d42bd55b9d3c80e279f2ee2fb0a795
 2016-12-14 11:46:26 +00:00
Michal Karpinski
e093a98925 Merge "Fix javadoc for PackageManager#getNameForUid()" 2016-12-14 11:44:02 +00:00
Erik Kline
208336e710 Merge "More correct startup and shutdown procedures." into nyc-mr2-dev 
am: c8059fb94c

Change-Id: Ib017af2b267689c0833b92c13f29da1d2e69a011
 2016-12-14 11:39:44 +00:00
Erik Kline
20cad0821d More correct startup and shutdown procedures. 
am: 6c0782f1ae

Change-Id: Ib488e0cb49da2d3f655e189600f839721ea73358
 2016-12-14 11:39:36 +00:00
TreeHugger Robot
c8059fb94c Merge "More correct startup and shutdown procedures." into nyc-mr2-dev 2016-12-14 11:33:38 +00:00
Michal Karpinski
bfdba46d3c Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev am: d9eb4fce7d 
am: 25946b8d69

Change-Id: I5b687aa68de13a21fc9ae11ca1ab80754096b543
 2016-12-14 11:18:51 +00:00
Michal Karpinski
a5ef89d13c DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent am: e3639a0a07 
am: ea792a7c11  -s ours

Change-Id: I4269ee3f955c4287c3d132640921128595e17f2c
 2016-12-14 11:17:15 +00:00
Michal Karpinski
5c8f42d377 DO NOT MERGE Fix Lint errors for network logging API am: 0c4ec00f85 
am: 306b268fb7  -s ours

Change-Id: Ife3603ab1be3a1be340b0cc03d17be49a201e6fa
 2016-12-14 11:16:16 +00:00
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
25946b8d69 Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev 
am: d9eb4fce7d

Change-Id: If60d1886cd42d34aed83255e3262b6234645118d
 2016-12-14 10:58:32 +00:00
Michal Karpinski
ea792a7c11 DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent 
am: e3639a0a07

Change-Id: Ie91f46915144c0f15e9a058b45ca7e55c54f796c
 2016-12-14 10:58:22 +00:00
Michal Karpinski
306b268fb7 DO NOT MERGE Fix Lint errors for network logging API 
am: 0c4ec00f85

Change-Id: I3fc8e08509440057c1d87dd2023cd2b7d8177530
 2016-12-14 10:57:26 +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
Michal Karpinski
d9eb4fce7d Merge changes from topic 'network-logging-nyc-mr2-dev' into nyc-mr2-dev 
* changes:
  DO NOT MERGE Fixes in comments for NetworkEvent, DnsEvent and ConnectEvent
  DO NOT MERGE Fix Lint errors for network logging API
  DO NOT MERGE Logging when the new batch of network logs broadcast is sent to DO
  DO NOT MERGE Disable DO single user features when clearDeviceOwner() is called regardless of the amount of users
  DO NOT MERGE Fix disabling DO single user features when clearDeviceOwner() is called
  DO NOT MERGE [DPM] Minor code fixes in NetworkLoggingHandler
  DO NOT MERGE [DPM] DO uses batch token to retrieve network logs, and can retrieve the same batch many times
  DO NOT MERGE [DPM] Management and retrieval of network logs
  DO NOT MERGE [DPM] DO can start network logging and listen for events
 2016-12-14 10:44:23 +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
6c0782f1ae More correct startup and shutdown procedures. 
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.

During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.

Bug: 33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
 2016-12-14 18:53:26 +09: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