Commit Graph

81778 Commits

Author SHA1 Message Date
Tomasz Wasilczyk
3483ade171 Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev am: 72f5cb4fd2
am: 43c394080d

Change-Id: I43044570aa51f8f10c7efa8ff97805d87ad140e2
2017-08-05 21:12:24 +00:00
Tomasz Wasilczyk
43c394080d Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev
am: 72f5cb4fd2

Change-Id: I00cc081e7bc301684f0e7316c2634ab5363ff700
2017-08-05 20:59:17 +00:00
Tomasz Wasilczyk
72f5cb4fd2 Merge "Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1." into oc-mr1-dev 2017-08-05 20:47:14 +00:00
TreeHugger Robot
acd9589dd7 Merge "Restricting background apps from running jobs" 2017-08-05 04:04:02 +00:00
Hugo Benichi
b2cdd9ee30 Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e am: 8dfb91df6c am: 722c71ed8b
am: edea5c8266

Change-Id: Ie5df14e0ea1c12e0cfabe87978ac6c9b744353b2
2017-08-05 01:40:48 +00:00
Hugo Benichi
edea5c8266 Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e am: 8dfb91df6c
am: 722c71ed8b

Change-Id: I12636c6699ff60487a28570208e819ea0b66fa2e
2017-08-05 01:28:01 +00:00
Hugo Benichi
722c71ed8b Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240 am: f6346af47e
am: 8dfb91df6c

Change-Id: I533ef8fe369cec19d283ff2950314fce6e28cffd
2017-08-05 01:14:30 +00:00
Hugo Benichi
8dfb91df6c Merge "NetworkCapabilities: fix describeImmutableDifferences" am: 7575ec2240
am: f6346af47e

Change-Id: Ieccad46fcffcaf748f5644b04617e9a82527000e
2017-08-05 01:01:04 +00:00
Hugo Benichi
f6346af47e Merge "NetworkCapabilities: fix describeImmutableDifferences"
am: 7575ec2240

Change-Id: If38efacdeec8476880835657938e435f9b598525
2017-08-05 00:54:43 +00:00
Suprabh Shukla
3ac1daac40 Restricting background apps from running jobs
Introducing a new app op which controls whether apps are allowed to run
jobs in the background. When the app op mode is set to ignored, jobs
will be delayed until the app is in the foreground. The same semantics
as background check for O apps will apply, which means power whitelisted
apps can still run jobs freely and apps will have some settle time after
going to background after which their jobs will be stopped.

Test:
Added AppOpsUpgradeTest for upgrading appops to inherit existing value of
OP_RUN_ANY_IN_BACKGROUND from OP_RUN_IN_BACKGROUND
Added backgroundRestrictionsTest for background jobs. To run the test:
mmm -j32 services/tests/servicestests/
adb install -r \
out/target/product/marlin/data/app/JobTestApp/JobTestApp.apk
adb install -r \
out/target/product/marlin/data/app/FrameworksServicesTests/FrameworksServicesTests.apk
adb  shell am instrument -e class
'com.android.server.job.BackgroundRestrictionsTest' -w
'com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner'

Bug: 63001625
Change-Id: I6eb01adb6cd2c1d0e7be4f7eca960f57ad9581bf
2017-08-04 16:13:06 -07:00
Tomasz Wasilczyk
162d14a1ea Pass ProgramInfo over currentProgramInfoChanged and drop afSwitch_1_1.
Bug: b/64229617
Test: instrumentation
Change-Id: Ib4b20a6ebdd05a51f1a30447ccc3c2357df2a35d
2017-08-04 15:22:52 -07:00
Tomasz Wasilczyk
3bf594f064 Merge "Merge "Pass vendor-specific info as map." into oc-mr1-dev am: b4dcdd5f45" into oc-mr1-dev-plus-aosp
am: 8814183722

Change-Id: I001980f504db005dd8a220bc9c8ba514e48645cc
2017-08-04 21:36:44 +00:00
Tomasz Wasilczyk
2e935d20c7 Merge "Pass vendor-specific info as map." into oc-mr1-dev
am: b4dcdd5f45

Change-Id: I90ba8b94f6730cab7ec2850046a87dd50e894652
2017-08-04 21:23:42 +00:00
Tomasz Wasilczyk
b4dcdd5f45 Merge "Pass vendor-specific info as map." into oc-mr1-dev 2017-08-04 21:12:21 +00:00
Yi Jin
c82d4ed96a Merge "Only replace new line characters if the wakelock name contains one The original operation creates new string everytime which is expensive" 2017-08-04 20:52:03 +00:00
Yi Jin
8529150860 Only replace new line characters if the wakelock name contains one
The original operation creates new string everytime which is expensive

Bug: 64272195
Test: NA
Change-Id: Id93d588a7d5a6b6c192a057fcd4296bd1c508516
2017-08-04 13:27:20 -07:00
TreeHugger Robot
b186823314 Merge "Improve TextView.onMeasure() for multiline text." 2017-08-04 19:24:01 +00:00
Seigo Nonaka
917748ef50 Improve TextView.onMeasure() for multiline text.
Previously, measures all paragraph for deciding view width.
However, in case AT_MOST measurment, we can stop calculating measure if
the measured paragraph already exceeds the upper limit.

Bug: 64389125
Test: bit CtsWidgetTestCases:*
Test: CorePerfTest. Here is a result before and after this patch.

Before:
INSTRUMENTATION_STATUS: measure_AtMost_median=50332114
INSTRUMENTATION_STATUS: measure_Exactly_median=28276317
INSTRUMENTATION_STATUS: measure_Unspecified_median=50193036

After:
INSTRUMENTATION_STATUS: measure_AtMost_median=28475187
INSTRUMENTATION_STATUS: measure_Exactly_median=26944710
INSTRUMENTATION_STATUS: measure_Unspecified_median=50880088

Change-Id: I2a39eb39817a8f845c4fa2e174a905a2d057096e
2017-08-04 17:21:06 +00:00
Andrei Stingaceanu
b969b3eb98 Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev am: 8719c2a8e6
am: 45d18e2834

Change-Id: Ie161f8b1065791c1523f981a955561d810417097
2017-08-04 13:32:21 +00:00
Andrei Stingaceanu
45d18e2834 Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev
am: 8719c2a8e6

Change-Id: I4a2c15dfdd59da941aa679bb948f43d10499c7cc
2017-08-04 13:20:16 +00:00
Andrei Stingaceanu
8719c2a8e6 Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev 2017-08-04 13:08:40 +00:00
TreeHugger Robot
680a74c056 Merge "Refactor TextView TextAppearance attributes reading" 2017-08-04 07:58:00 +00:00
Hugo Benichi
2ecb9408f4 NetworkCapabilities: fix describeImmutableDifferences
This patch fixes the mask used in describeImmutableDifferences which did
not correctly turn NET_CAPABILITY_NOT_METERED into bit flag.

Bug: 63326103
Test: added unit tests, runtest frameworks-net
Change-Id: Ib6b390b1daef5912859302692af7dcd6cfd3e39a
2017-08-04 15:17:40 +09:00
Tadashi G. Takaoka
93dcf32590 Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER am: 7b16a3c64a
am: 7d7f68d49f

Change-Id: I28896755b1fa14ebc37bce0f7a7c78aa18fea377
2017-08-04 05:26:10 +00:00
Tadashi G. Takaoka
7d7f68d49f Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER
am: 7b16a3c64a

Change-Id: Ie96d7fd5d0803a484ba7b06601c2c784cdfdf65d
2017-08-04 05:14:36 +00:00
Tadashi G. Takaoka
7b16a3c64a Remove @hide ACTION_SHOW_INPUT_METHOD_PICKER
All references to
android.provider.Settings.ACTION_SHOW_INPUT_METHOD_PICKER have been
removed by the following CLs.

 Id36c8c34159bea8b72557b40bcf024d401f580b6 frameworks/base
 Id990c66516c9b3ed7ada6891746ec0e0eecbe545 packages/apps/Settings
 I915231678b94f97c1b5105cb607d6631e3df6b6a vendor/google_clockworks
 I3e26ed807445725262485ac1065fdfa299d1b624 cts

Test: make checkbuild
Fixes: 64008672
Bug: 6364455
Change-Id: I4210a5b5662be497d395a454f7f1cc395637683e
2017-08-04 04:30:33 +00:00
Yi Jin
a92f00b750 Merge "There must not have newline character in wakelock name" into oc-mr1-dev
am: 10841a9670

Change-Id: I832c6e037d74d44de610facc58ed4e0deda6c667
2017-08-04 02:27:58 +00:00
TreeHugger Robot
10841a9670 Merge "There must not have newline character in wakelock name" into oc-mr1-dev 2017-08-04 02:18:50 +00:00
Tomasz Wasilczyk
0f1776d08b Pass vendor-specific info as map.
This solves a problem of identifying, if a given application is talking
to a hardware that can handle format of these strings.

Bug: b/64229617
Test: VTS, instrumentation
Change-Id: I6f525be90105bfdc01a899feea2a3151719ec8d2
2017-08-03 18:21:22 -07:00
Amith Yamasani
d76830053d Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 am: 26f8f5c868
am: 7d00772ceb

Change-Id: Ib23376b9f072522167c02ea009a0284ab5eabccb
2017-08-03 23:40:10 +00:00
Christopher Tate
1fb409cbf5 Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev am: 4204f1658c
am: 454f1466b7

Change-Id: I0e7f9f1297ca3f8a8fd02b7b578905fc38a5b8a9
2017-08-03 23:30:09 +00:00
Amith Yamasani
7d00772ceb Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
am: 26f8f5c868

Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58
2017-08-03 23:29:23 +00:00
Christopher Tate
454f1466b7 Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev
am: 4204f1658c

Change-Id: I2621dcbb5b727a5420095223f36d3e6e5784799d
2017-08-03 23:18:57 +00:00
Amith Yamasani
26f8f5c868 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am: 5a800cf069

Change-Id: I4b2e2dc81baea8078b0bca1db357e234bda27bf7
2017-08-03 23:18:32 +00:00
Amith Yamasani
6aaaa2bbb0 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev
am: 5a800cf069

Change-Id: I99d131e00dc43982f41e8837f44a66c71312615a
2017-08-03 23:18:29 +00:00
TreeHugger Robot
bb29df8b14 Merge "Reverse check for multi-character ellipsis" 2017-08-03 23:16:46 +00:00
TreeHugger Robot
4204f1658c Merge "Use normal API for legacy wallpaper restore" into oc-mr1-dev 2017-08-03 23:07:53 +00:00
Amith Yamasani
5a800cf069 Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev 2017-08-03 23:07:32 +00:00
Lucas Dupin
89f58e156e Merge "Multi-user and WallpaperColors" into oc-dr1-dev
am: e09e5ef21b

Change-Id: Idb06a8e04ac1cb9bf73fe168217d5369bb412b4f
2017-08-03 22:56:54 +00:00
Yi Jin
1533ffdc3e There must not have newline character in wakelock name
Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
(cherry picked from commit dd214c2d36)
2017-08-03 22:56:15 +00:00
Yi Jin
be738c5a28 Merge "There must not have newline character in wakelock name" 2017-08-03 22:53:10 +00:00
Lucas Dupin
e09e5ef21b Merge "Multi-user and WallpaperColors" into oc-dr1-dev 2017-08-03 22:48:27 +00:00
Roozbeh Pournader
55fd45b273 Reverse check for multi-character ellipsis
Reverse a recently-introduced incorrect check for multi-character
ellipsis in Layout.java. The check was introduced in
Id1dfdc503f87fabed2447d55ab2107eee0eccd08.

Test: bit CtsTextTestCases:*
Test: bit FrameworksCoreTests:android.text.
Change-Id: I79198be0bd202a303f8db02a235c2af3b76abf32
2017-08-03 14:01:09 -07:00
Jeremy Joslin
f16bb77191 Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev
am: 589ba65d91

Change-Id: I971c3a922340ee2d73722eea5e293d928b6f9a54
2017-08-03 20:46:38 +00:00
TreeHugger Robot
589ba65d91 Merge "NetworkRecommendationProviders require the location permission." into oc-mr1-dev 2017-08-03 20:37:16 +00:00
Tor Norbye
3f1ccec743 64123323: Allow marking fields with @TargetApi(XX)
Test: Tested as part of lint
Change-Id: I52dcc0ea788ed916d23be4d7c9fb76755a1aa6b8
2017-08-03 20:02:31 +00:00
Yi Jin
dd214c2d36 There must not have newline character in wakelock name
Bug: 64272195
Test: N/A
Change-Id: I07a7d9b9dfbf69acba0123bf4ec6e309c2a5a359
2017-08-03 11:29:49 -07:00
Abodunrinwa Toki
213791f74d Merge "Remove LangId related code." into oc-mr1-dev am: 38bbbdfae6
am: 2566e91f9f

Change-Id: Ic481522e134d17bbaaa3741208a3fee5426ce688
2017-08-03 18:19:23 +00:00
Christopher Tate
9f22443b4e Use normal API for legacy wallpaper restore
No longer do we play crazy rename-into-place tricks!  Just take
the restored image and treat it as an ordinary new system wallpaper,
and let the system machinery do all its proper work.  While we're at
it, we get rid of the now-spurious shenanigans about backing up the
wallpaper under the 'android' package, an overdue and welcome bit
of thinning.

In addition, we now fully migrate a legacy wallpaper image to have
both a source and a display crop in place.  We were previously
not generating the equivalent source image, which made N+ backups
unable to store the image properly.

Fix 64269208
Fix 62809439
Test: manual (set wallpaper under M, backup, flash to ToT,
      force restore)

Change-Id: If9b26b777f0fda95cf37c3c790a3fa4e82ff0340
2017-08-03 11:10:41 -07:00
Abodunrinwa Toki
2566e91f9f Merge "Remove LangId related code." into oc-mr1-dev
am: 38bbbdfae6

Change-Id: I336cab55855dc43c42d73fdf363d8db016bdaf70
2017-08-03 18:07:19 +00:00