Amith Yamasani
7d00772ceb
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
...
am: 26f8f5c868
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
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
2017-08-03 23:18:32 +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
2017-08-03 22:56:54 +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
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
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
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
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
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
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
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
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
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
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
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
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
2017-08-02 23:04:58 +00:00
Tarandeep Singh
9c4115a562
Merge "Fix keyboard focus in VR" into oc-dr1-dev
...
am: 986995d481
2017-08-02 22:59:51 +00:00
Chien-Yu Chen
cd1cb83314
Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
...
am: 615f9e1277
2017-08-02 22:58:15 +00:00
Chien-Yu Chen
3dd904da89
Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89 am: 615f9e1277
...
am: 5a7aefdb3d
2017-08-02 22:52:51 +00:00
Jeff Sharkey
623fbea979
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
...
am: 65abebbadd
2017-08-02 22:49:42 +00:00
Jeff Sharkey
1ab9c0cdff
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebbadd
...
am: eb6733e93a
2017-08-02 22:43:52 +00:00
Evan Rosky
64dd913f68
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
...
am: ae938cee71
2017-08-02 22:42:21 +00:00
Evan Rosky
caab68931b
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev am: ae938cee71
...
am: 756685b506
2017-08-02 22:40:48 +00:00
Jeremy Joslin
59502ebcfd
NetworkRecommendationProviders require the location permission.
...
Any NetworkRecommendationProvider bound to by the system must have
access to location (i.e. it holds the location permission and
location is enabled on the device).
If the location permission is revoked then the binding will be
disconnected and the system will revert to the default network
recommendation provider (if set and valid). If location access
is disabled on the device then the binding will be disconnected
but the system won't fall back to the default provider (because
it won't have location either), instead the current provider will
be re-enabled when location access is enabled again.
BUG:62263953
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Test: runtest frameworks-services -c com.android.server.NetworkScorerAppManagerTest
Change-Id: I93c37eeda47840d92f3ca52767e878dc19b46740
(cherry picked from commit d816abe97b
2017-08-02 21:34:26 +00:00
Roozbeh Pournader
6359944a19
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
...
am: 6e8e322ea1
2017-08-02 21:17:06 +00:00
TreeHugger Robot
6e8e322ea1
Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev
2017-08-02 21:08:54 +00:00
Tarandeep Singh
7def2eea97
Merge "Fix keyboard focus in VR" into oc-dr1-dev
...
am: 986995d481
2017-08-02 20:42:08 +00:00
Tarandeep Singh
986995d481
Merge "Fix keyboard focus in VR" into oc-dr1-dev
2017-08-02 20:33:02 +00:00
Chien-Yu Chen
5a7aefdb3d
Merge "camera2: Fix template requirements" into oc-dev am: 2976109d89
...
am: 615f9e1277
2017-08-02 20:05:22 +00:00
Chien-Yu Chen
615f9e1277
Merge "camera2: Fix template requirements" into oc-dev
...
am: 2976109d89
2017-08-02 19:56:55 +00:00
TreeHugger Robot
2976109d89
Merge "camera2: Fix template requirements" into oc-dev
2017-08-02 19:43:31 +00:00
Jeff Sharkey
eb6733e93a
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
...
am: 65abebbadd
2017-08-02 19:33:49 +00:00
Evan Rosky
756685b506
Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev
...
am: ae938cee71
2017-08-02 19:25:42 +00:00
TreeHugger Robot
65abebbadd
Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
2017-08-02 19:09:04 +00:00
Dianne Hackborn
5a0d703564
Merge "Improve docs about exceptions through Binder." into oc-mr1-dev
...
am: 6e3af279ab
2017-08-02 17:59:17 +00:00
