Philip P. Moltmann
fddf68261e
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
...
am: 61b0f84005
Change-Id: I0d2d0cffe3a78a843ae97d3946bbbbd7d4138044
2016-12-14 18:21:47 +00:00
Philip P. Moltmann
fbf2adaf6e
Do not write if apply() did not change the file.
...
am: ea10cc0fbb
Change-Id: I58f1f71dd4a8b4725205555531fa5d66284e3cd0
2016-12-14 18:21:39 +00:00
Philip P. Moltmann
2f1bb85277
Only persist last Shared Preferences state
...
am: 31d6889f4c
Change-Id: I0324e5e391d3d426cef8ef52ea04f529c5c7580f
2016-12-14 18:21:33 +00:00
Julius D'souza
d8a6e8eaa2
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
...
am: 323f2dbc46 -s ours
Change-Id: Iec1380282c06bbe970c5e178143dede6939b8b0a
2016-12-14 18:21:23 +00:00
Julius D'souza
a481fd31cf
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: Icf2354559cf4c0cac6d61d89378b00e9831e9e14
2016-12-14 18:15:47 +00:00
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
Philip P. Moltmann
61b0f84005
Merge changes from topic 'backportSharedpreferencesSpeedUp' into nyc-mr2-dev
...
* changes:
Do not write if apply() did not change the file.
Only persist last Shared Preferences state
2016-12-14 18:13:34 +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
Chris Craik
15589c36d7
Merge "Outline & Path perf improvements"
2016-12-14 18:03:22 +00:00
Calin Juravle
8d2a51f1b8
Report non-primary dex files loads to PM
...
Scaffold for the reporting of non-primary dex files loads to the package
manager.
This will enable:
1) monitoring and compilation of secondary dex file
2) better way to track foreign dex file usage (used to determined the
compilation filter of apks).
Test: device boots
Bug: 32871170
Change-Id: Ib0fe076af2c734dd054f092247a1ec7e2a74a70d
2016-12-14 18:01:54 +00:00
Julia Reynolds
4a02afbf04
Change notification shade ordering.
...
Certain ongoing and people centric notifications can now
(mostly) trump importance-based ordering.
Bug: 30374279
Test: runtest systemui-notification
Change-Id: Ieab6015174f9595c08057dc408233202035aae3e
2016-12-14 17:58:11 +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
Marie Janssen
cb21ad71ed
Bluetooth: log message improvements
...
Some log improvements:
- Reduce logspam
- Use names for states in logs instead of numbers
- Be more consistent with messages
Also remove some commented out dead code.
Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
2016-12-14 09:51:30 -08: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
Sergei Vasilinetc
82f8f3e04e
Merge "Prohibit Config.HARDWARE in factory methods, that create mutable bitmaps"
2016-12-14 17:40:49 +00:00
Marco Nelissen
d194a782ba
Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed am: 8b1eed4ee8
...
am: 10cb330d3e
Change-Id: I5c97e47ff9a5f193645660c195ddd707b86ad025
2016-12-14 17:19:46 +00:00
TreeHugger Robot
9112c16e16
Merge "Adding public API for marking nodes as clusters and sections."
2016-12-14 17:17:35 +00:00
John Reck
713d153146
Merge "Delete dead code"
2016-12-14 17:16:44 +00:00
Derek Sollenberger
3eda170b77
Merge "Remove Rasterizer and its subclasses from the public API."
2016-12-14 17:16:04 +00:00
Marco Nelissen
10cb330d3e
Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed
...
am: 8b1eed4ee8
Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa
2016-12-14 17:12:59 +00:00
Jeremy Joslin
e7f273d508
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: Iacf7b6d424ec3c57e8b89e5abc6bc3e8414097b9
Merged-In: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
2016-12-14 09:11:29 -08:00
Stefan Kuhne
58eea91f9d
Merge "Fixing timeout caused by non executed animation"
2016-12-14 17:10:17 +00:00
Roozbeh Pournader
9559c20a39
Deprecate android.text.AndroidCharacter
...
AndroidCharacter was added to compensate for limitations in
java.lang.Character, but it has been outdated and its functionality
is provided with a much better API by android.icu.lang.UCharacter.
Bug: 32551718
Test: cts-tradefed run cts-dev --module CtsTextTestCases --test android.text.cts.AndroidCharacterTest
Change-Id: Iec1969dc5787a4ebb0e68cdc213d3d0cdc3b2d0d
2016-12-14 17:08:56 +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
Victor Chang
c10f6693fc
Add EXTRA_PROVISIONING_DISCLAIMERS
...
- It's Bundle[]
- Each Bundle has EXTRA_PROVISIONING_DISCLAIMER_HEADER
and EXTRA_PROVISIONING_DISCLAIMER_CONTENT for header and content
- the disclaimer header is a localized String
Bug: 32760305
Test: built successfully
Change-Id: Ibc4ed25027f5949a0faa92ebf1f5ea1d518368eb
2016-12-14 16:41:21 +00:00
Mike Reed
6c67f1d045
SkClipOp is now an enum class
...
Change-Id: If423dd013a264162ae0b7674a0eeef34bc2cdaae
2016-12-14 10:29:54 -05:00
Paul Duffin
dc73fc06e0
Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b am: b5f056068d
...
am: 44da75ebc3
Change-Id: Ibc0b1b7b432cc6357efac907258e4066aef6394a
2016-12-14 15:23:53 +00:00
Michal Karpinski
60d1feed92
[DPM] Allow lower strong auth timeout on debuggable builds
...
Timeout can be set to lower than 1h on debuggable builds (eng, user-debug)
using persist.sys.min_strong_auth_timeout system property.
Bug: 29825955
Change-Id: I51d421c3e10625787ecfdbe011f9128cd47cb2a2
2016-12-14 15:23:35 +00:00
Paul Duffin
bf46e6b2e1
Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556 am: c3650beee5
...
am: e9be5d908d
Change-Id: I826ea0752c64b39f3cb9c96a6a33c0f2c4fad98b
2016-12-14 15:22:43 +00:00
Paul Duffin
44da75ebc3
Merge "Copy core-junit files into legacy-test." am: 69e363f506 am: 884d3ca53b
...
am: b5f056068d
Change-Id: Ib5f9f0744dbb610210394264d088df0db8b05988
2016-12-14 15:16:51 +00:00
Paul Duffin
e9be5d908d
Copy core-junit files into legacy-test. am: cd7c34d8bf am: 98e609d556
...
am: c3650beee5
Change-Id: I04560b5982651d175a268056f32eb36980ef2259
2016-12-14 15:15:51 +00:00
Nicolas Prevot
d5b036014d
Use affiliation ids when checking bind target users.
...
BUG:32764274
Test: adb shell am instrument -e class
com.android.server.devicepolicy.DevicePolicyManagerTest -w
com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ic79b58dcb583b1d9eb9e7af0d1501cf8cfd0ee86
2016-12-14 15:15:10 +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
Julia Reynolds
9ed3a080e8
Merge "DND string change."
2016-12-14 14:11:22 +00:00
Paul Duffin
c8d43bdcb5
Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1 am: 49a848e46f
...
am: 61a967a3f0
Change-Id: Icfee21339efb024559ce01ab54c44dd76f3fa830
2016-12-14 14:00:12 +00:00
Paul Duffin
ed7d67a920
Copy junit-runner files into test-runner. am: eef35dd29a am: b46cecb6c4 am: b6421ce031
...
am: 50c1bb82b1
Change-Id: I7be2758511183480d9ba948ed1e0958e2e7a97c5
2016-12-14 13:56:44 +00:00
Paul Duffin
61a967a3f0
Merge "Copy junit-runner files into test-runner." am: 3e24af3eb7 am: 5d53a925a1
...
am: 49a848e46f
Change-Id: I92dee395822461470a5cf83d9bb63ba6ff2469c5
2016-12-14 13:47:09 +00:00
Paul Duffin
50c1bb82b1
Copy junit-runner files into test-runner. am: eef35dd29a am: b46cecb6c4
...
am: b6421ce031
Change-Id: I00457223985f4ada91ca9df97bb24fe957de1b24
2016-12-14 13:43:45 +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