OSDN Git Service
Daniel Nishi [Mon, 27 Mar 2017 21:52:46 +0000 (14:52 -0700)]
Don't spam the log during quota calculations.
We base the cache quotas on usage stats on the device. These stats,
however, can contain entries from apps which are no longer installed.
In this case, we skip its calculation and log a warning. This patch
removes the warning aspect of it, because it is a legitimate case.
Change-Id: I2a6a797966bfee007515735308535a5dcc118f03
Fixes:
36649802
Test: Manual
TreeHugger Robot [Mon, 27 Mar 2017 16:35:55 +0000 (16:35 +0000)]
Merge "WatchDog: dump hal pids when killing a process."
Yorke Lee [Mon, 27 Mar 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Only change bounds if new activity is being added to InTask"
TreeHugger Robot [Mon, 27 Mar 2017 15:57:16 +0000 (15:57 +0000)]
Merge "Fix font golden image using Oracle JDK"
TreeHugger Robot [Mon, 27 Mar 2017 15:48:54 +0000 (15:48 +0000)]
Merge "Store the number of saved networks in WifiTracker."
Jeff Sharkey [Mon, 27 Mar 2017 15:22:47 +0000 (15:22 +0000)]
Merge "Add a new "virtual disk" feature."
Steven Moreland [Tue, 21 Mar 2017 19:52:16 +0000 (12:52 -0700)]
WatchDog: dump hal pids when killing a process.
Test: `adb shell am hang --allow-restart` -> Watchdog dumps
hal traces (eventually)
Bug:
36414311
Change-Id: I5143cedf3e5ab4695d2507a29993e748f6de17d5
TreeHugger Robot [Mon, 27 Mar 2017 14:51:08 +0000 (14:51 +0000)]
Merge "TextClassifier cleanup."
Diego Perez [Mon, 27 Mar 2017 14:28:52 +0000 (14:28 +0000)]
Merge "Handle case where canvas is 0x0 for shadows"
Neil Fuller [Mon, 27 Mar 2017 14:23:37 +0000 (14:23 +0000)]
Merge "Update settings to use latest IDs for zones" am:
c75dbe9d9c am:
0f3235a167
am:
2a3c633d49 -s ours
Change-Id: Ibc4d5dea60639ba1504290948de4675aaf6dbb17
Neil Fuller [Mon, 27 Mar 2017 14:17:33 +0000 (14:17 +0000)]
Merge "Update settings to use latest IDs for zones" am:
c75dbe9d9c
am:
0f3235a167
Change-Id: I0a7c8e33d84995b36793b2ed3485f985bc251bc5
Neil Fuller [Mon, 27 Mar 2017 14:12:35 +0000 (14:12 +0000)]
Merge "Update settings to use latest IDs for zones"
am:
c75dbe9d9c
Change-Id: If3708653ad78fb38e57508c4d8fac9dd5bffc2c1
Treehugger Robot [Mon, 27 Mar 2017 14:06:34 +0000 (14:06 +0000)]
Merge "Update settings to use latest IDs for zones"
Diego Perez [Mon, 27 Mar 2017 13:19:43 +0000 (14:19 +0100)]
Fix font golden image using Oracle JDK
Test: Fixes test
Change-Id: Ie90d55ee73d6342524ba2b8b267d190cb5218fc8
TreeHugger Robot [Mon, 27 Mar 2017 13:01:34 +0000 (13:01 +0000)]
Merge "add alert and reason enums"
TreeHugger Robot [Mon, 27 Mar 2017 12:55:02 +0000 (12:55 +0000)]
Merge "Create NotificationChannels in SystemUI per-user"
Neil Fuller [Thu, 23 Mar 2017 14:46:52 +0000 (14:46 +0000)]
Update settings to use latest IDs for zones
Various zones in timezones.xml were being identified by old
IDs. The settings picker and setup wizard uses the exact
ID when pre-selecting the user's current zone. Since the
autodetection uses the new IDs in places like Buenos
Aires users would not have the correct zone pre-selected
during setup.
Thanks to Marcio Ikeda of LG for the report.
Other legacy IDs found with:
for TZ in `grep 'id=' timezones.xml \
| awk -F\" '{ print $2 }'`; do \
grep ${TZ} ~/Downloads/tzdata2016g/zone.tab > /dev/null; \
if (( $? != 0 )); then echo Bad: ${TZ}; fi; \
done
New IDs found using tzdata NEWS and "backward" file.
Test: Manual testing: selection of the zone in the settings
Bug:
36469833
(cherry picked from commit
b4d003da66beb414e8e7fcec94a82a53027dbbfa)
Merged-In: I8c20494a48870cdc600854756061e86db730e14a
Change-Id: I829a70921eb13b763b5446820c87672615f2524d
Neil Fuller [Mon, 27 Mar 2017 12:28:26 +0000 (12:28 +0000)]
Merge "Update settings to use latest IDs for zones"
TreeHugger Robot [Mon, 27 Mar 2017 11:12:55 +0000 (11:12 +0000)]
Merge "Updating font test after the TextView fix"
Michal Karpinski [Mon, 27 Mar 2017 09:28:00 +0000 (09:28 +0000)]
Merge "Add support for key-value packages to adb backup/restore."
Joel Scherpelz [Mon, 27 Mar 2017 05:35:41 +0000 (05:35 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"" am:
63d26caa38 am:
84c2fb2070
am:
c3e0dcf082
Change-Id: I9a48897312a785ea7e0338aa68c8bb4877a741e6
Joel Scherpelz [Mon, 27 Mar 2017 05:29:02 +0000 (05:29 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"" am:
63d26caa38
am:
84c2fb2070
Change-Id: I6601d7a30e3eabc3e3929a02f415ba620a2b5c28
Joel Scherpelz [Mon, 27 Mar 2017 05:24:09 +0000 (05:24 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
am:
63d26caa38
Change-Id: I367506eee558dbd7abeeabf09716f7024c2e43d8
Joel Scherpelz [Mon, 27 Mar 2017 05:17:20 +0000 (05:17 +0000)]
Merge "Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces""
Joel Scherpelz [Fri, 24 Mar 2017 02:39:14 +0000 (02:39 +0000)]
Revert "Set accept_ra_rt_info_max_plen to 64 before enabling IPv6 interfaces"
On second thought, let's set accept_ra_rt_info_m**_plen in
Netd (InterfaceController::initializeAll())
This reverts commit
25870a2c9effd7a7d31c0678c34a6e952b2d56a1.
Change-Id: I22b000623bb852e375385d4aae789d007e84ba3d
TreeHugger Robot [Sun, 26 Mar 2017 21:59:19 +0000 (21:59 +0000)]
Merge "Send storage broadcasts to manifest receivers."
TreeHugger Robot [Sun, 26 Mar 2017 21:56:46 +0000 (21:56 +0000)]
Merge "Another buggy app is already targeting O."
Jeff Sharkey [Sun, 26 Mar 2017 20:34:47 +0000 (14:34 -0600)]
Send storage broadcasts to manifest receivers.
Bug:
35316141
Test: builds, boots
Change-Id: I50998416f189a7f7662ba59ad5a6b6cacf114cf2
Jeff Sharkey [Sun, 26 Mar 2017 20:15:19 +0000 (14:15 -0600)]
Another buggy app is already targeting O.
Bug:
36612878
Test: builds, boots
Change-Id: I161a58bf972a0af327fb216d041a7e46d33c0d2e
Jeff Sharkey [Sun, 26 Mar 2017 05:14:06 +0000 (23:14 -0600)]
Add a new "virtual disk" feature.
It's extremely difficult to test storage related logic on devices
that don't have physical SD card slots. So to support better
debugging and testing, add a new "virtual disk" feature which mounts
a 512MB file through loop device.
Also move ParcelFileDescriptor.open() over to using Os.open() so
that it gets StrictMode treatment.
Bug:
34903607
Test: builds, boots, virtual disk works
Change-Id: I072a3a412cfcc8a2a3472919b7273a1ed794fd98
TreeHugger Robot [Sat, 25 Mar 2017 18:17:14 +0000 (18:17 +0000)]
Merge "Add logging constant for reset dashboard page."
Sudheer Shanka [Sat, 25 Mar 2017 08:01:09 +0000 (08:01 +0000)]
Merge "Update AMS to use NetworkManagementInternal.isNetworkRestrictedForUid."
Sudheer Shanka [Sat, 25 Mar 2017 08:00:35 +0000 (08:00 +0000)]
Merge "Add NetworkManagementInternal.isNetworkRestrictedForUid."
Wonsik Kim [Sat, 25 Mar 2017 05:34:21 +0000 (05:34 +0000)]
Merge "MediaFrameworkTest: don't set surface if video format is unsupported"
TreeHugger Robot [Sat, 25 Mar 2017 04:04:10 +0000 (04:04 +0000)]
Merge "Target selection for Accessibility button"
TreeHugger Robot [Sat, 25 Mar 2017 02:50:32 +0000 (02:50 +0000)]
Merge "Prevent inclusion of null KeyphraseMetadata in info map."
Guang Zhu [Sat, 25 Mar 2017 02:27:03 +0000 (02:27 +0000)]
Merge "Revert "Enable Wifi Wakeup Setting by default.""
Guang Zhu [Sat, 25 Mar 2017 02:26:24 +0000 (02:26 +0000)]
Revert "Enable Wifi Wakeup Setting by default."
Bug:
36385983
Bug:
32913119
Bug:
36604943
This reverts commit
abb947ac24b316a188965c341599973a1f7a3de9.
Change-Id: I484534dd6c24f5b2c2839781fc6a71d9e976a859
Casey Burkhardt [Fri, 24 Mar 2017 17:07:20 +0000 (10:07 -0700)]
Target selection for Accessibility button
Allows for selecting a single accessibility service or feature
to be triggered by the accessibility button in the navigation bar
Bug:
34720082
Test: Manual
Change-Id: I320febede0398b1eff38a87d4db31fd7dfc53062
Santos Cordon [Wed, 22 Mar 2017 00:05:36 +0000 (17:05 -0700)]
Add a default Surface to the VR Virtual Display.
Uses ImageReader as a do-nothing Surface to ensure the Virtual Display
gets passed through to SurfaceFlinger.
Without a Surface, the Virtual Display never makes it through the
android system to SurfaceFlinger. This change is needed to get the
Virtual Display recognized in the Flinger layers.
Test: 'setprop vr_virtualdisplay true' to enable virtual displays.
'setprop vr_debug_vd_receiver true' and shell restart for the test app.
Bug:
36491910
Change-Id: I2bf2cb4035dcf04484b7fb0bec61671864069335
Felipe Leme [Sat, 25 Mar 2017 00:36:38 +0000 (00:36 +0000)]
Merge "Make auto-fill UI robust"
Johan Toras Halseth [Fri, 3 Mar 2017 15:37:43 +0000 (15:37 +0000)]
Add support for key-value packages to adb backup/restore.
For adding CTS tests for packages having key-value backup agents, we add
support for key-value backups to the adb backup/restore command.
Previously, packages not supporting fullbackup would just be skipped on
this command. Now, by adding the -keyvalue flag to the adb backup command,
packages supporting key-value will also be added to the resulting
tarball. Similarly, if the tarball being supplied to adb restore
contains data from key-value packages, it will be restored.
This will later be utilized for writing CTS tests for such packages.
Test: adb backup -includekeyvalue -all && adb restore backup.ab
Change-Id: I7b4ccfb7072d01d29a888952145d7cce90a4f59e
TreeHugger Robot [Fri, 24 Mar 2017 23:48:05 +0000 (23:48 +0000)]
Merge "Update hidden WifiManager API."
TreeHugger Robot [Fri, 24 Mar 2017 23:13:56 +0000 (23:13 +0000)]
Merge "Use resolved ActivityInfo to set instant app installer"
TreeHugger Robot [Fri, 24 Mar 2017 23:04:02 +0000 (23:04 +0000)]
Merge "Collect background stats: bluetooth, wifi, sensors"
TreeHugger Robot [Fri, 24 Mar 2017 22:58:11 +0000 (22:58 +0000)]
Merge "Fix companion device feature presence check"
TreeHugger Robot [Fri, 24 Mar 2017 22:42:08 +0000 (22:42 +0000)]
Merge "Added support for maxAspectRatio manifest attribute."
Phil Weaver [Fri, 24 Mar 2017 22:31:12 +0000 (22:31 +0000)]
Merge "Restructure a11y shortcut settings"
TreeHugger Robot [Fri, 24 Mar 2017 22:25:16 +0000 (22:25 +0000)]
Merge "Remove "Allow persistent changes to the vendor overlay theme""
Felipe Leme [Thu, 23 Mar 2017 03:24:00 +0000 (20:24 -0700)]
Make auto-fill UI robust
Now the autofill UI tracks the movement of the anchor view,
both real and virtual and while still preventing the filled
app from accessing the chooser UI. This was achieved by using
a popup window in the app process to determine the window
location and adding a window presenter interface to popup
window that controls the actual window addition, removal, and
update which is implemented by the system server.
Test: all autofill CTS tests pass
bug:
36392498
bug:
35708258
bug:
34943932
fixes:
36039182
fixes:
36493078
Change-Id: I0321913b2e2e759f4b17003bf85cb873e63a467c
TreeHugger Robot [Fri, 24 Mar 2017 22:04:55 +0000 (22:04 +0000)]
Merge "AAPT2: Fix up file IO"
Badhri Jagan Sridharan [Fri, 24 Mar 2017 21:56:12 +0000 (21:56 +0000)]
Merge "Persist functions for oemOverride across reboot"
Stephen Chen [Fri, 24 Mar 2017 21:27:08 +0000 (21:27 +0000)]
Merge "Enable Wifi Wakeup Setting by default."
Felipe Leme [Fri, 24 Mar 2017 21:26:25 +0000 (21:26 +0000)]
Merge "Checks if an adapter item is null before addint it to options."
Fan Zhang [Fri, 24 Mar 2017 20:44:51 +0000 (13:44 -0700)]
Add logging constant for reset dashboard page.
Change-Id: I526bdd71dad46510a205ed7f540914e83f779224
Fix:
36458355
Test: builds
Wale Ogunwale [Mon, 20 Mar 2017 15:56:38 +0000 (08:56 -0700)]
Added support for maxAspectRatio manifest attribute.
- Allows an app to specify the maximum aspect ratio it supports.
- Support for overriding configuration and bounds at the activity
record and app window token level.
Test: cts/.../run-test CtsAppTestCases android.app.cts.AspectRatioTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowContainerTests
Test: bit FrameworksServicesTests:com.android.server.wm.WindowFrameTests
Bug:
36505427
Bug:
33205955
Bug:
35810513
Change-Id: Ib2d46ed0c546dd903d09d6bb7162a98bd390ba81
Fyodor Kupolov [Fri, 24 Mar 2017 18:38:16 +0000 (11:38 -0700)]
Use resolved ActivityInfo to set instant app installer
Previously we were only using the component name, which is not always
enough.
Now the resolved ActivityInfo is used and only 'flags'/'exported' and
'enabled' attributes are modified.
Test: Manual
Bug:
34751853
Change-Id: I32a2a2bd98cc5d73ab02ccfc100868b826bb8105
Jakub Pawlowski [Fri, 24 Mar 2017 20:46:59 +0000 (20:46 +0000)]
Merge "Expose connection update callback (4/4)" am:
60865e4a8d am:
45487910b4
am:
ccff3be9d4
Change-Id: I621210ff8d2c0b203d86e6ad2a11402466724b97
Jakub Pawlowski [Fri, 24 Mar 2017 20:41:51 +0000 (20:41 +0000)]
Merge "Expose connection update callback (4/4)" am:
60865e4a8d
am:
45487910b4
Change-Id: I43cca913c52aac4bd3487f7450ef8167c19db0df
Eugene Susla [Fri, 24 Mar 2017 20:35:45 +0000 (13:35 -0700)]
Fix companion device feature presence check
There was a typo causing the feature to be falsely detected as not present.
Test: Ensure feature presence is now detected correctly
Bug:
30932767
Change-Id: I44d137e89546596058b272e8eeaccc0a1db21aef
Jakub Pawlowski [Fri, 24 Mar 2017 20:36:30 +0000 (20:36 +0000)]
Merge "Expose connection update callback (4/4)"
am:
60865e4a8d
Change-Id: I0f5301b195b697743d1fb552dac4af8e1fd1445c
Jakub Pawlowski [Fri, 24 Mar 2017 20:31:31 +0000 (20:31 +0000)]
Merge "Expose connection update callback (4/4)"
Antony Sargent [Thu, 23 Mar 2017 23:32:04 +0000 (16:32 -0700)]
Create a metrics event for ag/
1972563 (instant apps detail screen)
Bug:
35098444
Test: Tests for functional changes are in ag/
1972563
Change-Id: I17de46278c815c9b6b385b111ca6544aa456d133
Yorke Lee [Fri, 24 Mar 2017 20:09:35 +0000 (13:09 -0700)]
Only change bounds if new activity is being added to InTask
When going through the setTaskFromInTask code path, there are multiple
scenarios where an activity isn't actually added to the task.
This change makes it such that the task is only resized if an activity
is actually being added to the task make this more semantically similar
to setTaskFromReuseOrCreateNewTask, where the task is only resized if
it is a newly created task.
This is a cherry-pick of
I111353c76e623925af21a34e395e3d5eb9282e8f
Bug:
35945071
Test: manual - setTaskFromInTask doesn't change bounds if
no new activity is added.
Change-Id: I4b8330ce775ec46812f6095c170a690fdea77736
Sudheer Shanka [Wed, 22 Mar 2017 02:31:37 +0000 (19:31 -0700)]
Update AMS to use NetworkManagementInternal.isNetworkRestrictedForUid.
And add global setting WAIT_FOR_NETWORK_TIMEOUT_MS.
Bug:
27803922
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
runtest -c android.provider.SettingsBackupTest frameworks-core
and manual
Change-Id: I6949cd517255670e2ce21ab2de24271082461b11
Lei Yu [Fri, 24 Mar 2017 20:01:22 +0000 (20:01 +0000)]
Merge "Add theme Theme.DeviceDefault.Settings.Dialog.NoActionBar"
Chris Wren [Tue, 14 Mar 2017 18:10:37 +0000 (14:10 -0400)]
add alert and reason enums
useful for notification logs
also some format cleanup
Test: make framework-protos
Change-Id: Iced9ee1d1648060c80243e34ccca060040207726
Evan Laird [Fri, 24 Mar 2017 19:43:30 +0000 (19:43 +0000)]
Merge "Move percentage to left of battery"
Casey Burkhardt [Fri, 24 Mar 2017 19:35:19 +0000 (19:35 +0000)]
Merge "Update metrics proto for revised Magnification Settings"
Sudheer Shanka [Fri, 17 Mar 2017 23:25:55 +0000 (16:25 -0700)]
Add NetworkManagementInternal.isNetworkRestrictedForUid.
This will be used by the ActivityManagerService to decide if
an app needs to block for network or not.
Bug:
27803922
Test: runtest -c com.android.server.NetworkManagementInternalTest frameworks-services
cts-tradefed run singleCommand cts-dev --module CtsHostsideNetworkTests -t com.android.cts.net.HostsideRestrictBackgroundNetworkTests
and manual
Change-Id: I9e62406e2638f70497b43b5b41607df41aefd66c
TreeHugger Robot [Fri, 24 Mar 2017 19:11:08 +0000 (19:11 +0000)]
Merge "Allow system UID to call isSecurityLoggingEnabled()"
Diego Perez [Fri, 24 Mar 2017 17:24:57 +0000 (17:24 +0000)]
Handle case where canvas is 0x0 for shadows
Test: N/A
Change-Id: Ie837fb4097d7e1e47e8f96c73bb79ac8e7772a6b
Andrew Solovay [Fri, 24 Mar 2017 18:20:15 +0000 (18:20 +0000)]
docs: Removing Android dev docs from Gerrit am:
ecf817682a am:
d4fdb6e3b2 am:
7ba81a3884
am:
5613cfb013 -s ours
Change-Id: I9ec75adb7ac3045a934ecfaf2d09de1990f1c2bc
Wonsik Kim [Tue, 21 Mar 2017 23:12:03 +0000 (16:12 -0700)]
MediaFrameworkTest: don't set surface if video format is unsupported
Bug:
31964524
Test: adb shell am instrument -w -r -e class com.android.mediaframeworktest.stress.MediaPlayerStressTest com.android.mediaframeworktest/.MediaPlayerStressTestRunner
Change-Id: Ied3b1eefe952dd878b413027c9747a8dd58e4f27
Andrew Solovay [Fri, 24 Mar 2017 18:15:39 +0000 (18:15 +0000)]
docs: Removing Android dev docs from Gerrit am:
ecf817682a am:
d4fdb6e3b2
am:
7ba81a3884
Change-Id: Ibf17dbc51a17e5155bee49024bf6772bcec88967
Andrew Solovay [Fri, 24 Mar 2017 18:12:20 +0000 (18:12 +0000)]
docs: Removing Android dev docs from Gerrit am:
ecf817682a
am:
d4fdb6e3b2
Change-Id: I5fe711e6596afacc4bb363224dcb78057abd99c2
Andrew Solovay [Fri, 24 Mar 2017 18:03:12 +0000 (18:03 +0000)]
docs: Removing Android dev docs from Gerrit
am:
ecf817682a
Change-Id: I0bcc2c8d0b63e73d88187c19ef4addeaed2bfdf0
Amin Shaikh [Thu, 23 Mar 2017 23:18:30 +0000 (16:18 -0700)]
Store the number of saved networks in WifiTracker.
Bug:
36532777
Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Change-Id: Ia43ba22e271c08a6dc17683b993fd8231057e45e
Felipe Leme [Fri, 24 Mar 2017 17:39:40 +0000 (10:39 -0700)]
Checks if an adapter item is null before addint it to options.
Change-Id: I60634d0990d1d5bc33703abd41997e560f59ec77
Fixes:
36589254
Test: CheckoutActivityTest.testAutoFillDynamicAdapterWithNullItems()
Geoffrey Pitsch [Fri, 24 Mar 2017 17:37:13 +0000 (13:37 -0400)]
Create NotificationChannels in SystemUI per-user
Fixes Screenshot notification when guest plus others.
Bug:
36516812
Test: runtest systemui
Change-Id: I0d851a28ba9b134afc02c72fc3684c1d0be25c41
Stephen Chen [Fri, 24 Mar 2017 01:21:56 +0000 (18:21 -0700)]
Enable Wifi Wakeup Setting by default.
Bug:
36385983
Bug:
32913119
Test: runtest --path
frameworks/base/core/tests/coretests/src/android/provider/SettingsProviderTest.java
Change-Id: Ia9205d28d7c215fd8c407560513036565e36537d
TreeHugger Robot [Fri, 24 Mar 2017 17:30:27 +0000 (17:30 +0000)]
Merge "Fix issue #
34855227: Bg check Android O: Able to start..."
Dianne Hackborn [Thu, 23 Mar 2017 23:11:25 +0000 (16:11 -0700)]
Fix issue #
34855227: Bg check Android O: Able to start...
...service after receiving broadcast in background
A new UidRecord should start out idle, not non-idle.
Test: added CtsAppTestCases:.ActivityManagerTest#testBackgroundCheckBroadcastService
Change-Id: Ib04e11b95958477eaba1e421fd901f9cd1ee705a
Dianne Hackborn [Fri, 24 Mar 2017 17:28:54 +0000 (17:28 +0000)]
Merge "Partially return NEW_PICTURE and NEW_VIDEO."
Jakub Pawlowski [Fri, 24 Mar 2017 02:05:55 +0000 (19:05 -0700)]
Expose connection update callback (4/4)
Test: manual
Bug:
30622771
Change-Id: I56a3c42814249abc33e95e84ce092c2d8df65434
Jack Yu [Fri, 24 Mar 2017 17:22:45 +0000 (17:22 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei" am:
ad2e7405ad am:
9b7d3a86bd
am:
7da96487ab -s ours
Change-Id: I14c2cfa9d1b4ba7986393b7aab00abe94d24fce5
Jack Yu [Fri, 24 Mar 2017 17:16:46 +0000 (17:16 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei" am:
ad2e7405ad
am:
9b7d3a86bd
Change-Id: I322d40e7696b34ad93781882120352587ff36363
Jack Yu [Fri, 24 Mar 2017 17:10:54 +0000 (17:10 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei"
am:
ad2e7405ad
Change-Id: I4e006290c54a371fc5f080c37f86ca946507d871
Philipp Weiß [Fri, 24 Mar 2017 17:07:35 +0000 (17:07 +0000)]
Merge "Add strings for link beneath CA Certs disclosures"
Jack Yu [Fri, 24 Mar 2017 17:02:58 +0000 (17:02 +0000)]
Merge "Deprecated getDeviceId and added getMeid and getImei"
Mady Mellor [Fri, 24 Mar 2017 16:54:14 +0000 (16:54 +0000)]
Merge "Add plugin interfaces to control notification menu / swipe behavior"
TreeHugger Robot [Fri, 24 Mar 2017 16:39:56 +0000 (16:39 +0000)]
Merge "Fix SystemUI intents"
Dmitri Plotnikov [Fri, 24 Mar 2017 15:58:55 +0000 (15:58 +0000)]
Merge "Adding TV-specific strings"
TreeHugger Robot [Fri, 24 Mar 2017 15:49:52 +0000 (15:49 +0000)]
Merge "Do not reuse fragment indices."
TreeHugger Robot [Fri, 24 Mar 2017 15:33:51 +0000 (15:33 +0000)]
Merge "Post WebView Zygote connection code to a background thread."
Kevin Schoedel [Wed, 22 Mar 2017 15:40:38 +0000 (11:40 -0400)]
Manage controller connection from VrCore to VrWindowManager.
Use VrManager as a proxy to pass the controller data file descriptor
from VrCore to VrWindowManager, since the latter is a purely native
service with no Java visibility.
This is intended to be replaced by moving the relevant parts of
VrWindowManager into VrCore (b/
36506799).
Bug:
35619424
Test: manual on device
Change-Id: I9545349893ed9b23de4ba8d3cb61c7d403ad0b97
Jason Monk [Fri, 24 Mar 2017 14:57:58 +0000 (14:57 +0000)]
Merge "QS: Clean up dual target accessibility"
Peeyush Agarwal [Fri, 24 Mar 2017 14:56:01 +0000 (14:56 +0000)]
Fix SystemUI intents
b/
35307747 moved these intents from android. to com.android. Change
filters in AndroidManifest so that the new intents are not filtered out
and actually get delivered.
Bug:
36085764
Change-Id: I7120f28e56d71b6bfa19dd59624d992ded79501c
Fixes:
36085764
Test: none
Diego Perez [Fri, 24 Mar 2017 14:55:38 +0000 (14:55 +0000)]
Updating font test after the TextView fix
Test: Updated
Change-Id: Ia427cc25936b7a6aed035a4068d53151c74e839d
Evan Laird [Fri, 24 Mar 2017 14:55:29 +0000 (10:55 -0400)]
Move percentage to left of battery
Original mocks had the percentage on the left side of the battery... So
I made it so.
Test: visual
Bug:
32539932
Change-Id: I311255777b74c2ff74e36c78cbe1b4b9743ec337