Svet Ganov
f1d788adee
Merge \"Merge \\"Merge \\\"Use proper lock when accessing the generation registry\\\" into nyc-dev am: dcf2e205bf\\" into nyc-mr1-dev am: d0302f579b\" into nyc-mr1-dev-plus-aosp
...
am: f910dab5f7
2016-07-07 01:47:45 +00:00
Jeff Sharkey
2e2c64556c
Merge \"Merge \\"Switch network cycle calculation to use Calendar.\\" into nyc-mr1-dev am: 3a4408640a\" into nyc-mr1-dev-plus-aosp
...
am: 54a704bfcd
2016-07-07 01:47:39 +00:00
Svet Ganov
eabaf266f8
Merge \"Merge \\"Use proper lock when accessing the generation registry\\" into nyc-dev am: dcf2e205bf\" into nyc-mr1-dev
...
am: d0302f579b
2016-07-07 01:31:55 +00:00
Jeff Sharkey
6d8cffc4e9
Merge \"Switch network cycle calculation to use Calendar.\" into nyc-mr1-dev
...
am: 3a4408640a
2016-07-07 01:31:46 +00:00
Android Build Merger (Role)
d0302f579b
Merge "Merge \"Use proper lock when accessing the generation registry\" into nyc-dev am: dcf2e205bf" into nyc-mr1-dev
2016-07-07 01:26:13 +00:00
Svet Ganov
84954568db
Merge \"Use proper lock when accessing the generation registry\" into nyc-dev
...
am: dcf2e205bf
2016-07-07 01:25:04 +00:00
TreeHugger Robot
3a4408640a
Merge "Switch network cycle calculation to use Calendar." into nyc-mr1-dev
2016-07-07 01:23:59 +00:00
Annie Chin
f83ada9e8a
Merge \\"Add callbacks to VoiceInteractionManagerService\\" into nyc-mr1-dev am: d58f07f58a
...
am: d99252358b
2016-07-06 23:35:03 +00:00
Annie Chin
d99252358b
Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
...
am: d58f07f58a
2016-07-06 23:29:50 +00:00
Annie Chin
d58f07f58a
Merge "Add callbacks to VoiceInteractionManagerService" into nyc-mr1-dev
2016-07-06 23:22:10 +00:00
Jeff Sharkey
f2bead5117
Switch network cycle calculation to use Calendar.
...
The older Time class is deprecated and doesn't handle edge cases
very well. So migrate the cycle calculation logic to use the
long-standing and well-supported Calendar API.
Bug: 28689087
Change-Id: Ic1802b3f8556402f99bfea4cd625c35dfed81ac0
2016-07-06 17:15:33 -06:00
Michael Kwan
246a9345f2
Merge \\"Allow preference theming to remove divider.\\" into nyc-mr1-dev am: 929c8f4a75
...
am: 0353f42f06
2016-07-06 23:00:00 +00:00
Jeff Sharkey
3d4ed8b46c
Merge \\"Don\\'t cache external storage directories.\\" into nyc-mr1-dev am: d683945251
...
am: fd6071215e
2016-07-06 22:59:54 +00:00
Daniel Nishi
57e845b51b
Merge "resolve merge conflicts of 7145cac to master"
2016-07-06 22:45:37 +00:00
Michael Kwan
0353f42f06
Merge \"Allow preference theming to remove divider.\" into nyc-mr1-dev
...
am: 929c8f4a75
2016-07-06 22:40:31 +00:00
Michael Kwan
929c8f4a75
Merge "Allow preference theming to remove divider." into nyc-mr1-dev
2016-07-06 22:34:29 +00:00
Daniel Nishi
3fd8c801ba
resolve merge conflicts of 7145cac to master
...
Change-Id: Idd0a8de30697687309953fd37b568207d2fc0be8
2016-07-06 14:04:36 -07:00
Jeff Sharkey
fd6071215e
Merge \"Don\'t cache external storage directories.\" into nyc-mr1-dev
...
am: d683945251
2016-07-06 20:54:48 +00:00
Tor Norbye
eecaafb9cc
Merge "Add @AnyThread, @Dimension and @Px"
2016-07-06 20:50:50 +00:00
TreeHugger Robot
d683945251
Merge "Don't cache external storage directories." into nyc-mr1-dev
2016-07-06 20:47:51 +00:00
Daniel Nishi
7145cace64
Merge \"Move the MIME type icon detection into the platform.\" into nyc-mr1-dev
...
am: 9459f93c97
2016-07-06 20:02:45 +00:00
Andreas Gampe
df5c966cac
Merge \\"Frameworks/base: Refactor UserHandle and Environment a bit\\" into nyc-mr1-dev am: e6fcebbf50
...
am: 9b4725d071
2016-07-06 20:02:44 +00:00
Andreas Gampe
9b4725d071
Merge \"Frameworks/base: Refactor UserHandle and Environment a bit\" into nyc-mr1-dev
...
am: e6fcebbf50
2016-07-06 19:57:08 +00:00
Daniel Nishi
9459f93c97
Merge "Move the MIME type icon detection into the platform." into nyc-mr1-dev
2016-07-06 19:54:27 +00:00
Svet Ganov
51b839544b
Use proper lock when accessing the generation registry
...
We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.
bug:29956424
Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee
2016-07-06 19:52:36 +00:00
Andreas Gampe
6e16714c68
Frameworks/base: Refactor UserHandle and Environment a bit
...
Refactor slightly to forbid using myUserId in the zygote (uid == 0).
Also factor Environment to put user data (vs shared data) into its
own class, which should keep the page the shared data is on actually
shared between processes.
Bug: 29338430
Change-Id: I05d1306b57658a83299e38076171f56cb364ea80
2016-07-06 18:07:44 +00:00
Daniel Nishi
c29d2b0492
Move the MIME type icon detection into the platform.
...
This allows the MIME type icons to be used in other system apps.
In this instance, the StorageManager app needs to show file icons
for a given file. By moving the icon mapping into a static library,
we can avoid duplicating the mapping and resources.
Bug: 29826961
Change-Id: Ic2dc7970cc5a5ca430e33425eb9f1ecbd733fe9a
2016-07-06 10:57:06 -07:00
Robin Lee
eac929cda9
Merge \\"Update isValidLockdownProfile to block PPTP\\" into nyc-mr1-dev am: da68f0614c
...
am: dfc9007e9a
2016-07-06 16:27:57 +00:00
Robin Lee
dfc9007e9a
Merge \"Update isValidLockdownProfile to block PPTP\" into nyc-mr1-dev
...
am: da68f0614c
2016-07-06 16:21:00 +00:00
Robin Lee
da68f0614c
Merge "Update isValidLockdownProfile to block PPTP" into nyc-mr1-dev
2016-07-06 15:57:23 +00:00
Erik Kline
c179797f8e
Merge \\"[net mgmt svc] add method to retrieve INetd reference\\" into nyc-mr1-dev am: 58ef88927d
...
am: e62b36bb33
2016-07-06 13:21:51 +00:00
Erik Kline
e62b36bb33
Merge \"[net mgmt svc] add method to retrieve INetd reference\" into nyc-mr1-dev
...
am: 58ef88927d
2016-07-06 13:15:47 +00:00
Erik Kline
4e37b70440
[net mgmt svc] add method to retrieve INetd reference
...
Bug: 21859053
Bug: 28135208
Change-Id: Idfb5ca65788ae8c7aea91f12d9d461686ad836d6
2016-07-06 19:32:01 +09:00
Robin Lee
bae6d820d2
Update isValidLockdownProfile to block PPTP
...
Since this isn't supported and it will take a framework update to make
it work.
Bug: 28807474
Change-Id: I12371134a1c51a53af26fe8c4db1f04b0f687abe
2016-07-06 09:41:05 +00:00
Hugo Benichi
58caee56cf
Merge \\"IpConn metrics: use @IntDef\\" into nyc-mr1-dev am: 018a205824
...
am: 48d9a3d42f
2016-07-05 15:02:04 +00:00
Hugo Benichi
48d9a3d42f
Merge \"IpConn metrics: use @IntDef\" into nyc-mr1-dev
...
am: 018a205824
2016-07-05 14:51:02 +00:00
TreeHugger Robot
018a205824
Merge "IpConn metrics: use @IntDef" into nyc-mr1-dev
2016-07-05 14:39:47 +00:00
Hugo Benichi
cf6b12f50a
IpConn metrics: use @IntDef
...
Change-Id: Iae23f04abd3d1a43e7217f4fd641cd5fa61a7a1b
2016-07-05 21:52:15 +09:00
Hugo Benichi
fc47039136
Merge \\"IpConn metrics: correctly read RA lifetimes\\" into nyc-mr1-dev am: 54756fdfd9
...
am: 5142df5613
2016-07-05 12:47:19 +00:00
Hugo Benichi
5142df5613
Merge \"IpConn metrics: correctly read RA lifetimes\" into nyc-mr1-dev
...
am: 54756fdfd9
2016-07-05 12:38:42 +00:00
Hugo Benichi
8acc08ed9d
IpConn metrics: add dhcp transition times am: 176ed01a1f
...
am: a2595b3b22
2016-07-05 12:38:14 +00:00
Hugo Benichi
a2595b3b22
IpConn metrics: add dhcp transition times
...
am: 176ed01a1f
2016-07-05 12:29:59 +00:00
Hugo Benichi
54756fdfd9
Merge "IpConn metrics: correctly read RA lifetimes" into nyc-mr1-dev
2016-07-05 12:25:55 +00:00
Hugo Benichi
176ed01a1f
IpConn metrics: add dhcp transition times
...
This patch adds lifetime durations of DhcpClient states to
DhcpClientEvents.
To record the duration of a state, the event is now recorded when the
DhcpClient state machine exits that state.
In addition this patch removes event logging of StoppedState,
DhcpState and DhcpHaveLeaseState.
Change-Id: Ibd37b5e3070f35113b6b45942b1e1ff19c27a90b
2016-07-05 17:32:56 +09:00
Hugo Benichi
6ccd51a338
IpConn metrics: correctly read RA lifetimes
...
This patch
- adds a Builder class for RaEvent.
- uses this Builder class for correctly recording the minimum
lifetime seen for every ICMP6 options tracked, instead of
recording the last lifetime seen.
- adds unit test coverage for RaEvent logging.
Change-Id: I6443932f5cf7a613a5c695c65a60eab01e60602a
2016-07-05 13:52:24 +09:00
Lorenzo Colitti
6e7deb491a
Merge \\"Unbreak unregisterNetworkCallback.\\" into nyc-mr1-dev am: f9b050ed9e
...
am: 7252e8c673
2016-07-05 02:28:07 +00:00
Lorenzo Colitti
7252e8c673
Merge \"Unbreak unregisterNetworkCallback.\" into nyc-mr1-dev
...
am: f9b050ed9e
2016-07-05 02:19:18 +00:00
Lorenzo Colitti
1ec11eb5bc
Unbreak unregisterNetworkCallback.
...
http://ag/1194313 broke unregisterNetworkCallback because the
system does not parcel the type of the request back to the app.
So when the app calls unregisterNetworkCallback, the
NetworkRequest that's passed in does not have a type and thus
doesn't match the request in mNetworkRequests.
Fix this by parceling over the type as well.
This was not caught by the unit test because the unit test all
runs in the same process with no parceling.
Bug: 23113288
Change-Id: I58b2ed651b9bf5cbdcca5b25c3ca24db53cffdf1
2016-07-05 01:59:49 +09:00
Abodunrinwa Toki
e04e653f64
Merge "FloatingToolbar: Check that app supports RTL."
2016-07-04 13:46:49 +00:00
Michael Kwan
908523014e
Allow preference theming to remove divider.
...
Bug: 27962897
Change-Id: I6632f2a3c3d1290c472594f127ad33c9b85023f1
2016-07-02 19:31:32 -07:00
