Commit Graph

81559 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Lucas Dupin
e09e5ef21b Merge "Multi-user and WallpaperColors" into oc-dr1-dev 2017-08-03 22:48:27 +00: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
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
TreeHugger Robot
38bbbdfae6 Merge "Remove LangId related code." into oc-mr1-dev 2017-08-03 17:54:29 +00:00
Tomasz Wasilczyk
4da1bf10b7 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
am: 36ea87b075

Change-Id: I8802ac38c0167f0f2705bfaaf174d30743045a07
2017-08-03 17:02:52 +00:00
Tomasz Wasilczyk
36ea87b075 Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev 2017-08-03 16:52:31 +00:00
Lucas Dupin
430d7450ed Merge "Multi-user and WallpaperColors" into oc-mr1-dev
am: 22b418448b

Change-Id: I366a0968883a57499392edafcc95c53416268329
2017-08-03 16:35:36 +00:00
Lucas Dupin
22b418448b Merge "Multi-user and WallpaperColors" into oc-mr1-dev 2017-08-03 16:23:41 +00:00
Robert Carr
3f81745199 Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am: 48ed8aa4d0
am: e64d0028ae

Change-Id: Ib87b081ec02bfa030d0561cf12beac9d4b8ca692
2017-08-03 13:01:15 +00:00
Robert Carr
e64d0028ae Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am: 48ed8aa4d0

Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503
2017-08-03 12:53:40 +00:00
Robert Carr
76136dcf45 Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am: 48ed8aa4d0

Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273
2017-08-03 12:53:38 +00:00
TreeHugger Robot
48ed8aa4d0 Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev 2017-08-03 12:45:07 +00:00
Hugo Benichi
2096edd6f2 NsdManager: remove duplicated argument validation
am: cf96a1b36d

Change-Id: I3cad605d34cd9612b6073e689dc4af04b1717413
2017-08-03 07:28:16 +00:00
Hugo Benichi
cf96a1b36d NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.

This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.

This patch also includes a couple of other small cleanups.

Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 37013369

(cherry picked from commit ff3e6ccca1)

Change-Id: Icf047532aa551fbe0a70721cfb95507eaa84d51e
2017-08-03 14:19:43 +09:00
Kurt Nelson
ef5a4ca4e0 Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
am: e002f44005

Change-Id: If8cb15b7bf2d5994f7895c9743d8cd0e81f78f6f
2017-08-03 04:16:02 +00:00
TreeHugger Robot
e002f44005 Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev 2017-08-03 04:04:13 +00:00
John Reck
639afe25f3 Merge "Address API review comments" into oc-mr1-dev
am: dd5afab0d4

Change-Id: Ia6f1c19275c2a06d35a344bb2e14c376c9794088
2017-08-03 02:18:54 +00:00
TreeHugger Robot
dd5afab0d4 Merge "Address API review comments" into oc-mr1-dev 2017-08-03 02:10:16 +00:00
Lucas Dupin
50ba991655 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 18:34:00 -07:00
Dianne Hackborn
b49a3f1c3a Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev
am: 530cfc1db3

Change-Id: I2b1515dcc6acbffa43e1cfda1d1c8f68a077b1ad
2017-08-03 00:36:08 +00:00
TreeHugger Robot
530cfc1db3 Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev 2017-08-03 00:29:25 +00:00
Lucas Dupin
26fb43c034 Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Merged-In: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes: 63513694
2017-08-02 23:18:26 +00:00
Tarandeep Singh
ab1a5ff749 Merge "Fix keyboard focus in VR" into oc-dr1-dev am: 986995d481
am: 7def2eea97

Change-Id: I538777a295628827fc3052c58641cbb659afad20
2017-08-02 23:04:58 +00:00