OSDN Git Service
jackqdyulei [Fri, 17 Feb 2017 22:41:05 +0000 (14:41 -0800)]
Make precentage calculation round up by 0.5%
So we will show 1% when actually number is 0.5%
Bug:
35305983
Test: RunSettingsLibRoboTests
Change-Id: I26f11f25a7d78cc6b09cb358abd82017fa7cea00
TreeHugger Robot [Tue, 21 Feb 2017 19:23:43 +0000 (19:23 +0000)]
Merge "Overhaul GraphicsStatsService"
Rob Carr [Tue, 21 Feb 2017 19:04:06 +0000 (19:04 +0000)]
Merge changes I670fe942,I87eaf866,I4a729457
* changes:
Pinned stack animation: Fix inset logic.
Pinned stack animation: Trigger window preservation when dropping shadows.
Pinned stack animation: Prevent window preservation during animation.
Rob Carr [Tue, 21 Feb 2017 19:02:08 +0000 (19:02 +0000)]
Merge "Pinned stack animation: Correct scaling calculations."
Rob Carr [Tue, 21 Feb 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Pinned stack animation: Also clear finalClipRect."
Conrad Chen [Tue, 21 Feb 2017 18:59:59 +0000 (18:59 +0000)]
Merge "TIF: fix NPE caused by invalid component name"
TreeHugger Robot [Tue, 21 Feb 2017 18:52:21 +0000 (18:52 +0000)]
Merge "Fixing NPE when there is no running activity."
Peter Qiu [Tue, 21 Feb 2017 18:47:34 +0000 (18:47 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" am:
b13de64a11 am:
bedf92ed24
am:
763d6ab49b -s ours
Change-Id: I2af0b7dc0a2048bb5d357080526668f2f3ffb5ef
Peter Qiu [Tue, 21 Feb 2017 18:43:11 +0000 (18:43 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks" am:
b13de64a11
am:
bedf92ed24
Change-Id: Ibcbc93be7e0294e6a06976a6222adc8fe95582e7
Lei Yu [Tue, 21 Feb 2017 18:40:49 +0000 (18:40 +0000)]
Merge "Add statusLabel in BatteryInfo"
Peter Qiu [Tue, 21 Feb 2017 18:39:01 +0000 (18:39 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
am:
b13de64a11
Change-Id: I0e45cb17f11e8991d0d2c58cf7630f1e33296d97
Treehugger Robot [Tue, 21 Feb 2017 18:22:38 +0000 (18:22 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
Glen Kuhne [Tue, 21 Feb 2017 18:14:22 +0000 (18:14 +0000)]
Merge "Move wifi.proto to shared service .jar" am:
9ca5ddff4c am:
d0dcf559c5
am:
f231c62802 -s ours
Change-Id: I78421f235461a8534c2b2995873f25b3c86121e8
Robin Lee [Tue, 21 Feb 2017 18:13:12 +0000 (18:13 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService" am:
2c8229456a am:
433631edfe
am:
4d00a13c35
Change-Id: Id22859b30b848418cbc1bcf46c74ebd2aa88cd06
Erik Kline [Tue, 21 Feb 2017 18:12:07 +0000 (18:12 +0000)]
Merge "Don't request information on unregistered callbacks" am:
14e3db3de5 am:
042be0bd84
am:
507feec43a
Change-Id: I9d43269d4b3d3c61110a0ce07cb3cf8cd200aab6
Isaac Chen [Tue, 21 Feb 2017 18:10:18 +0000 (18:10 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision." am:
d95aa50b18 am:
7eca8f7073
am:
d60d606eba
Change-Id: Ib114f65ca5eee84dca7510866a15459334ec6460
Glen Kuhne [Tue, 21 Feb 2017 18:06:31 +0000 (18:06 +0000)]
Merge "Move wifi.proto to shared service .jar" am:
9ca5ddff4c
am:
d0dcf559c5
Change-Id: I7c0095922c87073732f29b623aee2d99608511cf
Robin Lee [Tue, 21 Feb 2017 18:05:37 +0000 (18:05 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService" am:
2c8229456a
am:
433631edfe
Change-Id: I2c5b9061435e17d8319a3109e28fa2a1b6f75154
Erik Kline [Tue, 21 Feb 2017 18:04:38 +0000 (18:04 +0000)]
Merge "Don't request information on unregistered callbacks" am:
14e3db3de5
am:
042be0bd84
Change-Id: Idd102961c422be5c94e4bf92c3aaae7f660f4313
Isaac Chen [Tue, 21 Feb 2017 18:02:59 +0000 (18:02 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision." am:
d95aa50b18
am:
7eca8f7073
Change-Id: I96e38dc38e372a27990b9cd1bda9f04676f13eb8
Glen Kuhne [Tue, 21 Feb 2017 17:56:13 +0000 (17:56 +0000)]
Merge "Move wifi.proto to shared service .jar"
am:
9ca5ddff4c
Change-Id: I3c10728fdbcd2882723a1bd519a47a63aeba0ac0
Robin Lee [Tue, 21 Feb 2017 17:55:07 +0000 (17:55 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService"
am:
2c8229456a
Change-Id: If8b7239cdabdd79d9ea24baf99e95c6ec1a9acf3
Erik Kline [Tue, 21 Feb 2017 17:54:13 +0000 (17:54 +0000)]
Merge "Don't request information on unregistered callbacks"
am:
14e3db3de5
Change-Id: I99bf9b6a092318cf5183b18d25bda36f9977ce4e
Isaac Chen [Tue, 21 Feb 2017 17:52:22 +0000 (17:52 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision."
am:
d95aa50b18
Change-Id: Ie31a736b2edd33c1cebbc08fbc39b555d501a349
John Reck [Thu, 19 Jan 2017 23:56:21 +0000 (15:56 -0800)]
Overhaul GraphicsStatsService
* LRU cache of recently-used is dead, replaced
disk storage
* ASHMEM size is read from native by the system service,
no longer requires keeping a sizeof() in sync with a
constant in Java
* Supports dumping in proto format by passing --proto
* Rotates logs on a daily basis
* Keeps a history of the most recent 3 days
Bug:
33705836
Test: Manual. Verified log rotating works by setting it up to
rotate every minute instead of day. Confirmed /data/system/graphicsstats
only has the most recent 3 entries after several minutes
Change-Id: Ib84bafb26c58701cc86f123236de4fff01aaa4aa
Daniel Nishi [Tue, 21 Feb 2017 17:37:55 +0000 (17:37 +0000)]
Merge "First pass at adding the cache quota suggestions."
Derek Sollenberger [Tue, 21 Feb 2017 17:37:35 +0000 (17:37 +0000)]
Merge "Add developer setting to set the default GPU renderer."
Derek Sollenberger [Tue, 21 Feb 2017 17:37:35 +0000 (17:37 +0000)]
Merge "Disable buffer age swap behavior for SkiaGL on Adreno gpus"
Glen Kuhne [Tue, 21 Feb 2017 17:27:03 +0000 (17:27 +0000)]
Merge "Move wifi.proto to shared service .jar"
Peter Qiu [Wed, 1 Feb 2017 19:49:15 +0000 (11:49 -0800)]
SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks
Previously, we were using provider name as the "SSID" for
Passpoint networks, and use it to compare against real SSIDs,
which obvious doesn't match. So fix it.
Also removed the Passpoint specific logics in WifiTracker for
tracking Passpoint networks, since there shouldn't any
difference in tracking Passpoint APs and normal APs.
Additional work is still needed for managing installed
Passpoint configurations in the "Saved networks" page,
and it is being tracked by b/
34207710. The Passpoint configuration
is not an "Access Point" per se, it is a network profile.
Bug:
34455883
Test: Install a Globla Reach Passpoint profile on a bullhead,
verify device auto connects to a Global Reach AP and UI
(QS, QS+, and Settings) correctly reflects it.
Change-Id: I63e66f683f8cb96e664516b130f5e7bc02358a10
Merged-In: I63e66f683f8cb96e664516b130f5e7bc02358a10
TreeHugger Robot [Tue, 21 Feb 2017 17:20:09 +0000 (17:20 +0000)]
Merge "SettingsLib: wifi: Fixed AccessPoint tracking for Passpoint networks"
Stefano Tommasini [Tue, 21 Feb 2017 17:08:06 +0000 (17:08 +0000)]
Merge "Add more instrumentation to BackupManager."
Bryan Mawhinney [Tue, 21 Feb 2017 15:56:50 +0000 (15:56 +0000)]
Merge "Move settings backup into separate class again"
Diego Perez [Tue, 21 Feb 2017 15:20:15 +0000 (15:20 +0000)]
Merge "Set MockView.setGravity to public"
George Mount [Tue, 21 Feb 2017 15:19:00 +0000 (15:19 +0000)]
Merge "Ensure transactions cannot be run during controller state change"
Philipp Weiß [Tue, 21 Feb 2017 15:13:51 +0000 (15:13 +0000)]
Merge "Show policy transparency dialog after failed screenshot"
Treehugger Robot [Tue, 21 Feb 2017 13:23:40 +0000 (13:23 +0000)]
Merge "Reinstate USER_PRESENT for ConnectivityService"
Diego Perez [Tue, 21 Feb 2017 12:55:10 +0000 (12:55 +0000)]
Merge "Add support for aapt:attr attributes"
Stefanot [Tue, 21 Feb 2017 10:48:18 +0000 (10:48 +0000)]
Add more instrumentation to BackupManager.
This CL continues work of: ag/
1835775 and ag/
1870141 adding a few more
logging constans described here:
https://docs.google.com/document/d/1sUboR28LjkT1wRXOwVOV3tLo0qisiCvzxIGmzCVEjbI/edit#
Test: manual
BUG:
34873525
Change-Id: I8c81d8cfea5538e89de94919062eeff6ae09dce4
Bryan Mawhinney [Tue, 21 Feb 2017 10:58:23 +0000 (10:58 +0000)]
Move settings backup into separate class again
This reverts commit
871f47c2200b58e06f97c0bc1e5f99f412692857,
fixes the blacklist and enables @Presubmit. Also removes
unnecessary @TargetApi.
Test: run FrameworksCoreTests
Change-Id: I20176b4585d25a023389b3af6fbff63fca432548
Bryan Mawhinney [Tue, 21 Feb 2017 10:52:59 +0000 (10:52 +0000)]
Merge "Revert "Move settings backup tests to own class""
Bryan Mawhinney [Tue, 21 Feb 2017 10:51:00 +0000 (10:51 +0000)]
Revert "Move settings backup tests to own class"
This reverts commit
a990c74b2a45a1bcc7fd3683d67009b73a24ed48.
Change-Id: I0b1bef2af10ba9b3499c69764fed125b8a25b3e9
Diego Perez [Tue, 21 Feb 2017 10:40:39 +0000 (10:40 +0000)]
Set MockView.setGravity to public
The method is used from Studio so it needs to be public.
Test: N/A
Change-Id: I603de9ae0c8b719f5173eff152cc2558f734017e
Bryan Mawhinney [Tue, 21 Feb 2017 10:14:55 +0000 (10:14 +0000)]
Merge "Move settings backup tests to own class"
Erik Kline [Tue, 21 Feb 2017 09:54:04 +0000 (09:54 +0000)]
Merge "Don't request information on unregistered callbacks"
Narayan Kamath [Tue, 21 Feb 2017 09:47:04 +0000 (09:47 +0000)]
Merge "PackageParser: String interning fixes."
Diego Perez [Mon, 21 Nov 2016 17:01:50 +0000 (17:01 +0000)]
Add support for aapt:attr attributes
Test: Tested from the studio side
Change-Id: Id506801f53cfc976c7352bd7f9632804862668b7
Diego Perez [Tue, 21 Feb 2017 09:30:00 +0000 (09:30 +0000)]
Merge "Fix BridgeContext.resolveThemeAttribute color parsing"
Erik Kline [Tue, 21 Feb 2017 07:21:46 +0000 (16:21 +0900)]
Don't request information on unregistered callbacks
Test: as follows
- build (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
35608572
Change-Id: I489e510ac131a7a624a652b12165104202a49f85
Isaac Chen [Tue, 21 Feb 2017 02:05:22 +0000 (02:05 +0000)]
Merge "Turned ENABLE_CPUSETS into runtime decision."
TreeHugger Robot [Mon, 20 Feb 2017 20:08:29 +0000 (20:08 +0000)]
Merge "Suppress RescueParty when active USB connection."
TreeHugger Robot [Mon, 20 Feb 2017 19:57:19 +0000 (19:57 +0000)]
Merge "Guard against possible AMS/PMS deadlock."
Chad Brubaker [Mon, 20 Feb 2017 19:50:35 +0000 (19:50 +0000)]
Merge "Use requesting userId for ApplicationInfo lookup"
TreeHugger Robot [Mon, 20 Feb 2017 19:30:32 +0000 (19:30 +0000)]
Merge "Fix incorrect title in PreferenceActivity."
TreeHugger Robot [Mon, 20 Feb 2017 18:50:51 +0000 (18:50 +0000)]
Merge "Revert "Modifying dpm.setSecureSetting call for install_non_market_apps""
Bryan Mawhinney [Fri, 17 Feb 2017 15:00:29 +0000 (15:00 +0000)]
Move settings backup tests to own class
And adjust blacklists to make tests pass again
Test: run FrameworksCoreTests
Change-Id: I28fa4509e23728c97c532c38842340f99487e890
Jeff Sharkey [Mon, 20 Feb 2017 18:02:26 +0000 (11:02 -0700)]
Guard against possible AMS/PMS deadlock.
PMS can't call into AMS while holding its local lock.
Test: builds, boots
Bug:
35410906
Change-Id: Ib80bbee5c0c3e5fb39ffef324e8176027da83f2f
Jeff Sharkey [Mon, 20 Feb 2017 17:45:06 +0000 (10:45 -0700)]
Suppress RescueParty when active USB connection.
When there is a very early system server runtime restart, we may not
yet have a published BatteryManagerInternal, so we need to go directly
to the "batteryproperties" native service to detect the USB state.
Test: builds, rescue is suppressed when USB is connected
Bug:
34872406
Change-Id: I949984cb95495c77de85ac322075177cff07b8b6
TreeHugger Robot [Mon, 20 Feb 2017 17:43:45 +0000 (17:43 +0000)]
Merge "Really fix regressions in IMMS#setImeWindowStatus"
Victor Chang [Mon, 20 Feb 2017 13:15:45 +0000 (13:15 +0000)]
Revert "Modifying dpm.setSecureSetting call for install_non_market_apps"
This reverts commit
2e7d6d64b9b16ea27634bc0e8843717a465142b4.
Bug:
35590590
Fix:
35590106
Test: runtest managed-provisioning
Test: manual verified that work profile can be inflated
Change-Id: Ie780b94053e65bca2f96b32055937c0c9e8beae8
Paul Duffin [Mon, 20 Feb 2017 16:10:16 +0000 (16:10 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am:
372b6b2c45 am:
3fbcd8cf38
am:
dec65547e2
Change-Id: Icd19f7ae6a7628df97ee7e8e57d63ca51ad581cc
Paul Duffin [Mon, 20 Feb 2017 16:06:03 +0000 (16:06 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()" am:
372b6b2c45
am:
3fbcd8cf38
Change-Id: Ie2bb70bea07f8642804cd6dc2e987e95e69ef633
Paul Duffin [Mon, 20 Feb 2017 15:59:06 +0000 (15:59 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
am:
372b6b2c45
Change-Id: Iafa345df241f4f713451aa42a7169eddb57eb1ea
Treehugger Robot [Mon, 20 Feb 2017 15:47:53 +0000 (15:47 +0000)]
Merge "Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()"
Paul Duffin [Mon, 20 Feb 2017 13:27:38 +0000 (13:27 +0000)]
Use Utils.assertTrue() in code that used junit.framework.Assert.assertTrue()
The previous changes to these files, which inlined the behavior
of Assert.assertTrue() were done in a hurry to fix the build.
This change makes use of the existing Utils.assertTrue() method
that was created for this purpose.
Bug:
30188076
Test: make checkbuild
Change-Id: Iacd505f8c3f7cefe6de94d30b56e39600bb9b0af
Paul Duffin [Mon, 20 Feb 2017 13:03:59 +0000 (13:03 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper" am:
9598c98db0 am:
e4add524e9
am:
1f2955ad0d
Change-Id: I0921dc15784c2aff6b1b1c4ce33fe8aed0eaba98
Paul Duffin [Mon, 20 Feb 2017 12:56:22 +0000 (12:56 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper" am:
9598c98db0
am:
e4add524e9
Change-Id: I8c22e84feff3fa597403a7de6300528f823268d7
Paul Duffin [Mon, 20 Feb 2017 12:48:55 +0000 (12:48 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper"
am:
9598c98db0
Change-Id: I15b0bbe22d18feca699ecaf4146dc9e2c279e5b5
Narayan Kamath [Fri, 10 Feb 2017 15:08:07 +0000 (15:08 +0000)]
PackageParser: String interning fixes.
Stop interning string metadata values as well as class names as it's
unlikely there will be much duplication among these.
Also make sure we intern the same set of strings when parsing packages
from their cache entries as we do when parsing them from the package
itself.
This change also improves error reporting for the unit-test and fixes
a failure that was introduced by a previous change (the addition of
static libraries).
Test: PackageParserTest
Bug:
34726698
Change-Id: Ia0d0342b91b3294bd5569756255918d1dc886e05
Paul Duffin [Mon, 20 Feb 2017 12:40:17 +0000 (12:40 +0000)]
Merge "Avoid using JUnit code in production WallpaperCropper"
Paul Duffin [Mon, 20 Feb 2017 12:33:42 +0000 (12:33 +0000)]
Avoid using JUnit code in production WallpaperCropper
Bug:
30188076
Test: make checkbuild
Change-Id: Ib6fe445a246d15dbabb8b86f9251b0059ed216b5
Philipp Weiß [Mon, 20 Feb 2017 12:04:16 +0000 (12:04 +0000)]
Merge "Remove Quicksettings footer in QuickQSPanel"
Jerome Gaillard [Mon, 20 Feb 2017 11:35:52 +0000 (11:35 +0000)]
Merge "Update FontFamily_Delegate following Change I1d6e1c4c"
Diego Perez [Mon, 20 Feb 2017 11:06:46 +0000 (11:06 +0000)]
Fix BridgeContext.resolveThemeAttribute color parsing
When passed a color, resolveThemeAttribute was not parsing the value
into the .data field.
Bug: http://b.android.com/232870
Test: Added new test
Change-Id: I9d91e3a70c24f1e71d9d89977fe79b0965e98893
Rubin Xu [Mon, 20 Feb 2017 11:03:22 +0000 (11:03 +0000)]
Merge "Normalize empty credential into null"
TreeHugger Robot [Mon, 20 Feb 2017 10:59:34 +0000 (10:59 +0000)]
Merge "Add support for remote views backed auto-fill UI"
Andrei Stingaceanu [Mon, 20 Feb 2017 10:27:03 +0000 (10:27 +0000)]
Merge "AutoSize TextView (part 10) - final APIs"
Svet Ganov [Sun, 19 Feb 2017 08:06:22 +0000 (00:06 -0800)]
Add support for remote views backed auto-fill UI
Test: CTS and manual
Change-Id: Ia09f0208d78439491052e4886a0e71c387b73370
TreeHugger Robot [Mon, 20 Feb 2017 04:05:57 +0000 (04:05 +0000)]
Merge "MediaSessionService: Notify volume key long-presses when the screen is off"
Jaewan Kim [Fri, 17 Feb 2017 14:14:10 +0000 (23:14 +0900)]
MediaSessionService: Notify volume key long-presses when the screen is off
When the screen is off, MediaSessionService doesn't get the volume key
long-press events from the PhoneWindowManager because PhoneWindowManager
intercepts them and only sends initial down and up events.
This is intended because users cannot see the safety warning dialog
which warns users about too loud volume.
This CL assumes that volume key is long-pressed if the key up doesn't
happen after the initial down within the long-press timeout, and notify
them with IOnVolumeKeyLongPressListener.
Bug:
35328001
Test: Manual test
Change-Id: I3b5aec4c2dd66a181bf41786f1417cc65874356c
Phil Weaver [Sun, 19 Feb 2017 04:48:15 +0000 (04:48 +0000)]
Merge "Verify fingerprint exists before using it"
Colin Cross [Sun, 19 Feb 2017 03:27:30 +0000 (03:27 +0000)]
Merge "Revert "Remove outdated emulator check which causes BT to not start""
TreeHugger Robot [Sat, 18 Feb 2017 23:53:07 +0000 (23:53 +0000)]
Merge "AudioService: prevent NPE on an invalid PIID"
TreeHugger Robot [Sat, 18 Feb 2017 23:47:06 +0000 (23:47 +0000)]
Merge "Fix a race in persisting instant cookie"
Colin Cross [Sat, 18 Feb 2017 20:05:47 +0000 (20:05 +0000)]
Revert "Remove outdated emulator check which causes BT to not start"
This reverts commit
d98a4e502165d76d05e095608da3c795bd56eafd.
Change-Id: Ibd1596584928f2aa2c799501536abc9b384d1cda
Chad Brubaker [Sat, 18 Feb 2017 19:41:26 +0000 (11:41 -0800)]
Use requesting userId for ApplicationInfo lookup
Change-Id: I4f29f31e48d66d16181fb415fd864de2746def94
Fixes:
34771610
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
Isaac Chen [Thu, 16 Feb 2017 03:51:08 +0000 (11:51 +0800)]
Turned ENABLE_CPUSETS into runtime decision.
ENABLE_CPUSETS is usually set in BoardConfig.mk to use CONFIG_CPUSETS
feature of Linux kernel.
This change turns the build time variable into runtime decision by
checking if a special file, "tasks", can be found under the mount
point, /dev/cpuset, for cpusets.
Bug:
34726944
Test: Tested on Sailfish
without cpuset mounted
with cpuset mounted, but without schedtune mounted
with cpuset mounted and with schedtune mounted
Change-Id: I1c044c3c9d4d15360a1605e7022da84d94df4014
Svet Ganov [Sat, 18 Feb 2017 04:48:24 +0000 (20:48 -0800)]
Fix a race in persisting instant cookie
Test: CTS passes and manual too
Change-Id: I8beb7edb84e5f7e2a181a9c237d6f0f761805d70
Tetsutoki Shiozawa [Sat, 18 Feb 2017 06:28:47 +0000 (06:28 +0000)]
Merge "Apply RTL layout to the title of ResolverActivity" am:
2122e42e9b am:
add56f7b66
am:
046194a0a7
Change-Id: Ic431cf76e498998b2b9c6d2e40ee46bd00db5a4d
Colin Cross [Sat, 18 Feb 2017 06:27:33 +0000 (06:27 +0000)]
Merge "WallpaperCropper has no tests, it doesn't need junit" am:
a34472b7e6 am:
11436455cf
am:
de523d80d1
Change-Id: Ib567b678baa71884b7d8b5b603cd4a9e3ced1c75
TreeHugger Robot [Sat, 18 Feb 2017 06:19:27 +0000 (06:19 +0000)]
Merge "resolve merge conflicts of
a110feee4cac to master"
TreeHugger Robot [Sat, 18 Feb 2017 04:40:26 +0000 (04:40 +0000)]
Merge "Removes an already defined warning in aapt."
TreeHugger Robot [Sat, 18 Feb 2017 04:23:41 +0000 (04:23 +0000)]
Merge "Fix a race when persisting cookie data"
Yohei Yukawa [Sat, 18 Feb 2017 04:13:52 +0000 (20:13 -0800)]
Really fix regressions in IMMS#setImeWindowStatus
My previous CL [1] that aimed to fix Bug
35395372 was imperfect.
It just converted InvalidParameterException into NullPointerException
due to a silly mistake in a new error check.
[1]: Ib9448c551d9a30776a999c27a5ff20f1a095633a
ee2a7ed3d971f83134a2b28258dd2e56f9634f94
Test: Made sure Bug
35395372 and Bug
35479942 are no longer
reproducible, that is,
1. Flash a new image and complete the setup wizard on a
direct-boot unaware device.
2. Set a device password and require it upon each device boot.
3. adb reboot
4. Observe the default IME does not crash because of
NullPointerException/InvalidParameterException thrown by IMMS.
Test: Made sure IMM#showSoftInputFromInputMethod(IBinder, int) does
not throw an NullPointerException even in an extreme case.
1. Rebuild LatinIME with the following code in LatinIME.java
@Override
public AbstractInputMethodImpl onCreateInputMethodInterface() {
return new InputMethodService.InputMethodImpl() {
@Override
public void attachToken(IBinder token) {
super.attachToken(token);
final InputMethodManager imm =
getSystemService(InputMethodManager.class);
final IBinder imeToken =
getWindow().getWindow().getAttributes().token;
imm.showSoftInputFromInputMethod(imeToken, 0);
}
};
}
2. adb install -r LatinIME.apk
3. adb shell ime enable com.android.inputmethod.latin/.LatinIME
4. adb shell ime set com.android.inputmethod.latin/.LatinIME
5. Tap any text field.
4. Observe LatinIME does not crash because of
NullPointerException/InvalidParameterException thrown by IMMS.
Bug:
34628091
Bug:
35079353
Fixes:
35395372
Fixes:
35479942
Change-Id: Id8e34ecb28480755e8141b6e46820b37fe3dc92b
Pulkit Bhuwalka [Sat, 18 Feb 2017 04:12:29 +0000 (20:12 -0800)]
resolve merge conflicts of
a110feee4cac to master
Test: Resolved merge conflict. Built locally.
Change-Id: If8e439d513ac2242b82f67a4c68bc3adfabe2b9c
TreeHugger Robot [Sat, 18 Feb 2017 02:59:29 +0000 (02:59 +0000)]
Merge "Fix Rgba16fTests@testTransferFunctionsShader test"
TreeHugger Robot [Sat, 18 Feb 2017 02:48:37 +0000 (02:48 +0000)]
Merge "Removing unnecessary call to ArraySet#toArray"
Aurimas Liutikas [Fri, 17 Feb 2017 20:06:41 +0000 (12:06 -0800)]
Removes an already defined warning in aapt.
Apps that expect to use the current SDK don't specify anything in their
manifest and the build system rightfully injects the current SDK.
Any apps that specify their own <uses-sdk> or versionCode are telling
the build system that they are purposely using some other minSdkVersion,
etc (support library demos).
Test: None
Change-Id: I0aba3a71e15703c7bcafcf4d35608a1851dd8567
Fixes:
34901699
TreeHugger Robot [Sat, 18 Feb 2017 02:25:35 +0000 (02:25 +0000)]
Merge "Fixes issues where the PiP menu activity is out of sync."
TreeHugger Robot [Sat, 18 Feb 2017 02:19:12 +0000 (02:19 +0000)]
Merge "Shared library test case addition"