OSDN Git Service
Phil Weaver [Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
am:
0ddaa63b67 -s ours
Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b
TreeHugger Robot [Wed, 30 Aug 2017 23:05:12 +0000 (23:05 +0000)]
Merge "Add heif format to ExifInterface" into oc-mr1-dev
Phil Weaver [Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)]
Merge "resolve merge conflicts of
490d397d284f to oc-dr1-dev" into oc-dr1-dev
Jason Monk [Wed, 30 Aug 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Don't touch auto dim on app change" into oc-mr1-dev
Christine Franks [Wed, 30 Aug 2017 22:33:01 +0000 (22:33 +0000)]
Merge "Update night display intensity coefficients" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:13:58 +0000 (22:13 +0000)]
Merge "Introduce SmartSelectionEventTracker." into oc-mr1-dev
Paul Mclean [Wed, 30 Aug 2017 22:13:36 +0000 (22:13 +0000)]
Merge "Adding USB audio-class 2.0 spec descriptors." into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 22:11:52 +0000 (22:11 +0000)]
Merge "BatteryStats: Don't schedule work when shutting down" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:52:19 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Hall Liu [Wed, 30 Aug 2017 20:41:53 +0000 (20:41 +0000)]
Merge "Make slight API and doc adjustments" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:35:52 +0000 (20:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:31:03 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:29:57 +0000 (20:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:28:10 +0000 (20:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:24:40 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:23:09 +0000 (20:23 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Jason Monk [Wed, 30 Aug 2017 20:17:19 +0000 (16:17 -0400)]
Don't touch auto dim on app change
Test: manual
Bug:
63630024
Change-Id: I134aa2695bad36606588ca3e52685826f25ea306
TreeHugger Robot [Wed, 30 Aug 2017 20:11:03 +0000 (20:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 19:34:24 +0000 (19:34 +0000)]
Merge "Adding back recents grow in split screen" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 19:32:58 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Christine Franks [Thu, 27 Jul 2017 00:51:16 +0000 (17:51 -0700)]
Update night display intensity coefficients
Bug:
64019890
Test: manual - adjust intensity slider
Change-Id: I38ec7385b36367e5c9f6c606e65a982efbd32a1b
Jeff Sharkey [Wed, 30 Aug 2017 19:01:18 +0000 (19:01 +0000)]
Merge "Augment network stats based on SubscriptionPlan." into oc-mr1-dev
Chris Tate [Wed, 30 Aug 2017 18:44:03 +0000 (18:44 +0000)]
Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
Chong Zhang [Fri, 25 Aug 2017 23:20:01 +0000 (16:20 -0700)]
Add heif format to ExifInterface
Get heif dimension and rotation from MediaMetadataRetriever.
Bug:
64077740
Change-Id: I711ac70d356dbfd9128a30ab33c0dfd81a4ae17e
Brad Ebinger [Wed, 30 Aug 2017 18:31:43 +0000 (18:31 +0000)]
Merge "Adds ERROR state to ImsConfig" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 17:47:46 +0000 (17:47 +0000)]
Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev
Adam Lesinski [Wed, 30 Aug 2017 02:30:31 +0000 (19:30 -0700)]
BatteryStats: Don't schedule work when shutting down
Prevent more work from being queued when BatteryStats is
shutting down.
Bug:
64901294
Test: manual
Change-Id: Ifc74a4405b40c949e440d6d65fdd13ec40920429
Paul McLean [Fri, 7 Jul 2017 14:14:52 +0000 (08:14 -0600)]
Adding USB audio-class 2.0 spec descriptors.
Added USB audio-class 2.0 format type descriptors.
Added Tree parsing.
Rearchitected reporting (again) to better support reuse and scale.
Bug:
64301464
Test: Run code against representative USB audio peripherals and verify
that each correctly handles or ignores all descriptors and the correct
device semantics (headset / not-headset) are still calculated.
Change-Id: I1b3b01ab1cd804ed876bf6427c3afba15eea6a6e
Jeff Sharkey [Tue, 29 Aug 2017 21:32:13 +0000 (15:32 -0600)]
Augment network stats based on SubscriptionPlan.
When a carrier provides an "anchor" of data usage at a specific
moment in time, augment the network statistics used by warning/limit
thresholds and Settings UI. For example, if the OS measured 500MB
of usage, but the carrier says only 400MB has been used, we "squish"
down the OS measured usage to match that anchor.
Callers using the hidden API will have their data augmented by
default, and the public API offers a way to opt-into augmentation.
Thorough testing to verify behavior.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.
Test: cts-tradefed run commandAndExit cts-dev -m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug:
64534190
Change-Id: Id3d4d7625bbf04f57643e51dbf376e3fa0ea8eca
Todd Kennedy [Wed, 30 Aug 2017 13:48:28 +0000 (13:48 +0000)]
Merge "Set CPU Abis for updated system packages" into oc-mr1-dev
Abodunrinwa Toki [Tue, 15 Aug 2017 14:05:11 +0000 (15:05 +0100)]
Introduce SmartSelectionEventTracker.
This will be used for logging text selection interaction.
Bug:
64914512
Test: No test. Everything builds fine.
Change-Id: Idb28864e0fc969be05d81855b2e7cd8389bd835e
Bill Yi [Wed, 30 Aug 2017 04:00:33 +0000 (21:00 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ied35c473af7c2834bc145269270d41c1fbb7563e
TreeHugger Robot [Wed, 30 Aug 2017 03:54:06 +0000 (03:54 +0000)]
Merge "Update comment for ASSIST_GESTURE_TRIGGERED" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 03:53:42 +0000 (20:53 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I1dbe08a427134a196041d6b68a220fc2a6a991d8
Bill Yi [Wed, 30 Aug 2017 02:42:12 +0000 (19:42 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Id452855fd3f6af7d1daaa2aede1baa65a78c557f
Bill Yi [Wed, 30 Aug 2017 02:35:20 +0000 (19:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I67b019a8fa6529ad6540e9c2cc784a413b411fe3
Bill Yi [Wed, 30 Aug 2017 02:29:09 +0000 (19:29 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I16a811e84d3642459e686c84dcc5cecbbf5ada9b
Tim Murray [Wed, 30 Aug 2017 02:13:38 +0000 (02:13 +0000)]
Merge "Revert "Fix transition between two occluding activities"" into oc-mr1-dev
Bill Yi [Wed, 30 Aug 2017 02:10:49 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I48522f7eba9fae610d5551a3dcdf6292a4a0abb8
Bill Yi [Wed, 30 Aug 2017 02:04:00 +0000 (19:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic27c4ce111ea2a017cec2e66812e922991152666
Bill Yi [Wed, 30 Aug 2017 01:57:44 +0000 (18:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I4eebbdb73bfd8558666b22135de33f7183ee8ee0
Bill Yi [Wed, 30 Aug 2017 01:51:00 +0000 (18:51 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I77ff98cb6d61c557fb070c8ba9939bc7dd5637cd
Bill Yi [Wed, 30 Aug 2017 01:43:54 +0000 (18:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: I6792eb7fe4f28b87cd53504b0c8318a751f33c27
Jason Monk [Wed, 30 Aug 2017 01:24:04 +0000 (01:24 +0000)]
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:57:23 +0000 (00:57 +0000)]
Merge "Screen-pinning unpin security fails for secondary user. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 30 Aug 2017 00:53:33 +0000 (00:53 +0000)]
Merge "Added system_server to system group" into oc-mr1-dev
Fyodor Kupolov [Wed, 30 Aug 2017 00:19:29 +0000 (00:19 +0000)]
Merge "Make shutdown logging thread-safe" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:56:50 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Christopher Tate [Tue, 29 Aug 2017 23:50:13 +0000 (16:50 -0700)]
Setting a wallpaper must be synchronous
Observable state needs to be fully established by the time the
caller is allowed to proceed, otherwise they might read stale
information. In particular, we hadn't yet committed changes to
the backing store by the time observers were released, so they
could then read a stale generation number as the "current" state.
With this fix, the flaky CTS test is now reliably passing.
Test: cts-tradefed run cts-dev -m CtsAppTestCases -t android.app.cts.WallpaperManagerTest\#setBitmapTest
Bug:
65016846
Change-Id: I93fc690caedfbcd455a91625a3c67fff9168483b
TreeHugger Robot [Tue, 29 Aug 2017 23:47:50 +0000 (23:47 +0000)]
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 23:41:47 +0000 (23:41 +0000)]
Merge "Prevent getting large bitmap log error for gobo" into oc-mr1-dev
Tim Murray [Tue, 29 Aug 2017 23:21:27 +0000 (23:21 +0000)]
Revert "Fix transition between two occluding activities"
This reverts commit
791ccc00aae7647d146646e4c8ec0d5e2f5bd4ed.
bug
65168260
Change-Id: Ib4bb2c694a7dc6c2359143b07edecaf894a2daee
Jason Monk [Tue, 29 Aug 2017 22:58:00 +0000 (18:58 -0400)]
Auto dim the nav bar to help prevent diff aging
Test: runtest systemui
Bug:
63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4
Phil Weaver [Tue, 29 Aug 2017 20:43:01 +0000 (13:43 -0700)]
resolve merge conflicts of
490d397d284f to oc-dr1-dev
Bug:
62196835
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: Ib00a23ae9a329cfc102b1a116b5a585be36b56f6
Hugo Benichi [Tue, 29 Aug 2017 22:29:08 +0000 (22:29 +0000)]
Merge changes I34c4a0c3,Iebc7d153,Ibb028886 into oc-mr1-dev
* changes:
Nat464Xlat: interface notification handler on ConnectivityService
Nat464Xlat: internal state guards cleanup + state enum
Nat464Xlat: clat management cleanup
TreeHugger Robot [Tue, 29 Aug 2017 22:22:12 +0000 (22:22 +0000)]
Merge "Use localized strings for HD Audio option label" into oc-mr1-dev
Jean-Michel Trivi [Tue, 29 Aug 2017 22:11:35 +0000 (22:11 +0000)]
Merge "AudioService: log changes in OP_PLAY_AUDIO" into oc-mr1-dev
Tyler Gunn [Tue, 29 Aug 2017 21:22:56 +0000 (21:22 +0000)]
Merge "Track conference start in system elapsed time." into oc-mr1-dev
Bill Yi [Tue, 29 Aug 2017 21:14:29 +0000 (21:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
db61e7ec73 -s ours
Change-Id: I1ef8dabac664c06ead9dffa6a515cd9fd50e2175
Tyler Gunn [Tue, 29 Aug 2017 21:06:20 +0000 (21:06 +0000)]
Merge "Handle alternate status values." into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 21:01:05 +0000 (21:01 +0000)]
Merge "Clear focused-in-cluster on focusability changes" into oc-mr1-dev
Koji Fukui [Tue, 22 Aug 2017 07:51:11 +0000 (16:51 +0900)]
Set CPU Abis for updated system packages
Symptom:
If Chrome package is updated and is disabled after reboot, all apps are
crashed when they use WebView.
Root cause:
CPU Abis for updated system packages are not set when newer version
exist. Updated system packages are not fully scanned.
But WebView can use WebViewProvider in the system Chrome package. It
refers CPU Abis and crash happens.
Solution:
Set CPU Abis even if the system package has newer updated version.
Fixes:
64926227
Fixes:
62980149
Test: Manual
Change-Id: I1ddc7be5a5b8928189410e30a0506d11279d0279
TreeHugger Robot [Tue, 29 Aug 2017 20:53:24 +0000 (20:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 29 Aug 2017 20:38:19 +0000 (13:38 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64712476
Change-Id: Ic2c86003ba40e7884913155316bf5c9eae7dc514
TreeHugger Robot [Tue, 29 Aug 2017 20:09:56 +0000 (20:09 +0000)]
Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
TreeHugger Robot [Tue, 29 Aug 2017 19:54:26 +0000 (19:54 +0000)]
Merge "Add shadow to adaptive icons to the shared sheet Test: manual Bug:
65015602" into oc-mr1-dev
Fyodor Kupolov [Tue, 29 Aug 2017 19:12:03 +0000 (12:12 -0700)]
Make shutdown logging thread-safe
Previously TRON_METRICS/SHUTDOWN_TIMINGS_LOG were accessed from
different threads. Now all access is properly synchronized.
Important: Moved saveMetrics from rebootOrShutdown. rebootOrShutdown
can be called directly from SystemServer class after reboot when
no metrics were collected.
Test: manual reboot/shutdown and verify that metrics are logged
Bug:
64815357
Change-Id: I7b02c9c6b10b920ce3532a0808ab71a0d6e07d2b
TreeHugger Robot [Tue, 29 Aug 2017 19:08:30 +0000 (19:08 +0000)]
Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
Amith Yamasani [Mon, 28 Aug 2017 16:41:22 +0000 (09:41 -0700)]
Screen-pinning unpin security fails for secondary user. DO NOT MERGE
The setting that inidcates that the user must unlock the device first
to unpin an app is always read for the owner user, so if the owner
disables this it will also be disabled for all secondary users no
matter what they have selected.
Bug:
64235463
Test: Manual
- Enable Screen-pinning for owner
- Uncheck 'Ask for PIN when unpinning'
- Create a secondary user
- Create keyguard PIN
- Enable screen-pinning for secondary user
- Check 'Ask for PIN when unpinning'
- Exit settings and start an app
- Pin the app from recents
- Unpin the app
The keyguard should appear on unpin with this commit applied
Change-Id: I8b9a98dc50e061b14c091d723223577cd94513ab
Jean-Michel Trivi [Mon, 28 Aug 2017 19:40:55 +0000 (12:40 -0700)]
AudioService: log changes in OP_PLAY_AUDIO
Log changes to AppOpsManager.OP_PLAY_AUDIO in live player
Test: "adb shell dumpsys audio" after entering silence mode
Bug:
62258749
Bug:
64286665
Change-Id: Ia1c202c5b8b25e14f7c2e85060a256dc69433909
Matthew Ng [Tue, 29 Aug 2017 18:24:58 +0000 (11:24 -0700)]
Prevent getting large bitmap log error for gobo
Forgotten to move a line of code to the area to ignore loading large
bitmaps causing an error log. The code related is ag/
2579729.
Test: manual - boot gobo device and read log
Change-Id: Iaeedf80b6fa25331f7db09e21db84574a53939b3
Fixes:
65127030
Phil Weaver [Tue, 29 Aug 2017 18:08:54 +0000 (18:08 +0000)]
Merge "Backport overlay security fix" into oc-dev
Sudheer Shanka [Tue, 29 Aug 2017 17:40:33 +0000 (17:40 +0000)]
Merge "KernelUidCpuFreqTimeReader: Put logs under debug flag." into oc-mr1-dev
Jiongxuan Gao [Thu, 24 Nov 2016 11:20:27 +0000 (20:20 +0900)]
Fix ListView can not be moved after rotation.
Symptom:
"Share with" popup displayed incompletely, and cannot be slid after
rotated the screen twice.
Root cause:
Since ChooserActivity's configChanges attribute contains
"screenSize|orientation" , when user rotates device, Android will
not recreate ChooserActivity, its content view ResolverDrawerLayout
is also not recreated. In ResolverDrawerLayout's onMeasure, it will
call getHeightUsed to calculate the ListView's height. getHeightUsed
will check against the lowest child view plus padding and margin
instead of the actual measured height of the ListView. This lets the
ListView hang off the edge when all of the content would fit on-screen
. Because of ResolverDrawerLayout has not been drawn yet, we can not
get the actual showing items' count of ListView before it's drawn, the
result of getChildCount for ListView will return the value in landscape
mode. The heightUsed of ListView might be smaller. mCollapsibleHeight
will be 0. When received a move action, the mCollapseOffset and new
position might both be 0.
Solution:
When configuration changed, we should rebuild the list and refresh
adapter's data set. Just like onRestart does.
Bug:
34365764
Change-Id: I4be0f9afc68588fbb0d8d152c41509650d04c754
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Merged-In: I22ae624a0c51110cb69679f796926e3b2b36d0ac
(cherry picked from commit
ee02e1ce774777e85b10be6d1ad5c6083fa08c18)
Bryce Lee [Tue, 29 Aug 2017 17:13:58 +0000 (17:13 +0000)]
Merge "Remove activity from stopping activities once resumed." into oc-mr1-dev
Nick Desaulniers [Tue, 29 Aug 2017 16:37:28 +0000 (16:37 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang" into oc-mr1-dev
Jean-Michel Trivi [Tue, 29 Aug 2017 16:35:45 +0000 (16:35 +0000)]
Merge "AudioService: log volume commands and origin" into oc-mr1-dev
Brad Ebinger [Fri, 25 Aug 2017 21:53:30 +0000 (14:53 -0700)]
Adds ERROR state to ImsConfig
Adds the ERROR return state for bool provisioning values
so that we can throw an Exception in some cases.
Bug:
64540800
Test: Manual
Change-Id: I0b79837c694d245999031ec65783857e114b7c75
Jorim Jaggi [Tue, 29 Aug 2017 11:32:07 +0000 (11:32 +0000)]
Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev
* changes:
Fix transition between two occluding activities
Use Keyguard orientation when unoccluding
Hugo Benichi [Wed, 5 Jul 2017 02:08:48 +0000 (11:08 +0900)]
Nat464Xlat: interface notification handler on ConnectivityService
This patch adds a layer of asynchonicity to the NetworkBaseObserver
callbacks implemented by Nat464Xlat in order to allow these callbacks
to run on the main ConnectivityService handler.
This allows to run interfaceLinkStateChanged and interfaceRemoved
callbacks in the same thread context as other Nat464Xlat methods and
solves the following issues:
- NPE risk due to race between fixupLinkProperties called on the
ConnectivityService thread and interfaceRemoved called as a
callback by NetworkManagementService.
- stale LinkProperties reads in both callbacks not called on
ConnectivityService handler.
- removes the race between stop() and interfaceRemoved().
This patch also:
- removes/simplifies comments related to the threading
model which are no obsolete.
- extract clatd management logic from ConnectivityService into
NetworkAgentInfo
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Merged-In: I889d98e47423ff3d4746d6ed8015b265286e7c52
Merged-In: I2f002cd197e2eeaaadadd747a6b33d264cd34433
Merged-In: Id3ab064cf9f4417c0e8988fff4167b65b3c8c414
Merged-In: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e
Merged-In: I9116a493ca1cbdf6a25664a1b0017aa6c9b38eb4
Merged-In: I12918d208364eef55067ae9d59fbc38477e1f1c6
(cherry picked from commit
771d5c2f0126ba692897c9716f4098ae6e3a870c)
Change-Id: I34c4a0c32ce7c9b7bd7acf8f87b932e15c573bd8
Sudheer Shanka [Tue, 29 Aug 2017 01:10:18 +0000 (18:10 -0700)]
KernelUidCpuFreqTimeReader: Put logs under debug flag.
Bug:
63041570
Test: N/A
Change-Id: Ifdeacb227bb936de82af9c9505621b327de3a9d2
TreeHugger Robot [Tue, 29 Aug 2017 03:13:57 +0000 (03:13 +0000)]
Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
Hall Liu [Fri, 14 Jul 2017 20:39:54 +0000 (13:39 -0700)]
Make slight API and doc adjustments
* Fix a compile error on Java 7
* Update initialization mechanism to allow exceptions and return codes
* App-facing api for StreamingService#dispose no longer throws an
IllegalArgumentException
* Add REASON_NONE to stream state change reasons
Bug:
30981736
Change-Id: I4710c6e56b35f74188f5877f0cf74b7773c1e9b7
Felipe Leme [Thu, 3 Aug 2017 21:27:57 +0000 (14:27 -0700)]
Hides the Save UI while handling a pending intent from CustomDescription.
When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.
That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.
Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases
Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes:
64309238
Hugo Benichi [Thu, 29 Jun 2017 05:04:13 +0000 (14:04 +0900)]
Nat464Xlat: internal state guards cleanup + state enum
This patch does some cleanup of Nat464Xlat internal state guards
against the Nat464Xlat state Idle | Started | Running, which reduces
code nesting.
It also replaces introspection of internal state for distinguishing
between different stages in 464xlat lifecycle with an enum explicitly
introducing these three Idle | Started | Running states.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to ipv6 network and went to test-ipv6.com
Merged-In: I6efc9fed2420ca488731a2b9b9c3c025b16eca10
Merged-In: I188ac4c367db11cb33b67fe92df3a120e3c6fbce
Merged-In: I7e2c5db8d537fb0ab47cde37158b7f04d7786942
Merged-In: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6
Merged-In: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00
Merged-In: Icc1558a0f0e7c299270f550897347458e2bd3188
(cherry pick from commit
4f6f139869ddadf6f9ed50967c106a10a2e8ce3f)
Change-Id: Iebc7d153d8cd0b90d074d8d6eed821fbc3f1370d
Carmen Jackson [Thu, 23 Feb 2017 23:21:10 +0000 (15:21 -0800)]
Added system_server to system group
Test: on gobo
pidof system_server appears in the correct file:
$ adb shell pidof system_server
859
$ adb shell cat /dev/memcg/system/tasks | grep '859'
859
Bug:
65130832
Change-Id: Id63abd473a7f2001688b0be06bfec6472c7f8648
Phil Weaver [Sat, 19 Aug 2017 01:01:46 +0000 (18:01 -0700)]
Backport overlay security fix
Replacing app opps fix with the flag that is used
elsewhere.
Bug:
37442941
Test: Verified that toast and system overlay still goes
away on permission and a11y service capability screens.
Merged-In: I1a3e3c5b1696a5f5b95eac187acb5a03863b4a0b
Change-Id: If9bec515105369055415d54c7fcad7a65431f8e7
Svetoslav Ganov [Tue, 29 Aug 2017 00:47:25 +0000 (00:47 +0000)]
Merge "Grant location to default launcher" into oc-mr1-dev
Justin Klaassen [Mon, 28 Aug 2017 22:39:45 +0000 (15:39 -0700)]
Use localized strings for HD Audio option label
Fixes:
63899732
Test: verified strings in Bluetooth device details
Change-Id: Icfbc4490dcd2a6aceeef53a2ae335e77e968060c
Yongqin Liu [Thu, 8 Jun 2017 08:15:29 +0000 (16:15 +0800)]
DeviceInfoUtils.java: support to show kernel version compiled with clang
The kernel version displayed in settings is only shown correctly
when built with gcc, this change adds support for a kernel built
with clang.
Test: manually on hikey with following command:
adb shell am instrument -w -e class com.android.settings.DeviceInfoSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Fixes:
32547905
Test: manual inspection of clang and gcc build kernel Settings.
Change-Id: I9b7991681cb5abdf44e7d1d1bff84c7c866be2ed
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Jean-Michel Trivi [Fri, 25 Aug 2017 00:24:57 +0000 (17:24 -0700)]
AudioService: log volume commands and origin
Add volume logger for volume events.
Move AudioService event definitions to separate file.
Test: change volume with volume buttons and dumpsys audio
Bug:
64470715
Change-Id: I25db849bffb4a41a737d226cfc40e2c6f7e0ecc0
TreeHugger Robot [Mon, 28 Aug 2017 23:20:18 +0000 (23:20 +0000)]
Merge "Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider" into oc-mr1-dev
Zheng Zhang [Tue, 22 Aug 2017 17:27:14 +0000 (10:27 -0700)]
Listen TRANSPORT_BLUETOOTH network change in GnssLocationProvider
TRANSPORT_BLUETOOTH is a essential network type for wearable device.
For non-master branch, only listen to Bluetooth on wearable device.
Bug:
64881794
Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.
Merged-In: I30e39943220597987320ea7843d7d36827fdd0c7
Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit
d6886710b5c9ed9d1567c4ee59773071bae7070c)
TreeHugger Robot [Mon, 28 Aug 2017 23:07:50 +0000 (23:07 +0000)]
Merge "Low ram devices recents list is throwable" into oc-mr1-dev
Matthew Ng [Wed, 26 Jul 2017 18:09:35 +0000 (11:09 -0700)]
Adding back recents grow in split screen
There was a regression where recents stopped growing when in split
screen and bottom app has less height than top. Then when pressing
recents button it would go into recents on bottom split and divider
would move to the center.
Test: manual - split with 2 apps, lower divider, press recents button
Fixes:
62431729
Change-Id: I3cacb4e4bd38a17602415ebee4e24a517115bbdd
TreeHugger Robot [Mon, 28 Aug 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bump special windows layer adjustment" into oc-mr1-dev
Svet Ganov [Mon, 28 Aug 2017 19:39:35 +0000 (12:39 -0700)]
Grant location to default launcher
Test: updated DefaultPermissionGrantPolicy test which passes
bug:
62959599
Change-Id: Ifaac04758348049dd170a7e7b7ac234dced5f759
Christopher Tate [Mon, 28 Aug 2017 21:16:22 +0000 (14:16 -0700)]
Note cross-user permission requirement for relevant wallpaper operations
Documentary change only.
Bug:
62343054
Test: N/A
Change-Id: Ibf6617b2c25306852478089b60a019479f8d2bcd