OSDN Git Service

android-x86/frameworks-base.git
6 years agoRevert "Log an App Op when an accessibility action is performed."
Phil Weaver [Sat, 16 Dec 2017 00:55:51 +0000 (00:55 +0000)]
Revert "Log an App Op when an accessibility action is performed."

CTS tests are now throwing security exceptions for accessibility actions.

This reverts commit 19eb58959b2b9cbf0d082ddc0640a6da99c8a3dc.

Change-Id: I2027ee4cca0fcc2b38bb615a58d992ef309e2d70

6 years agoLog an App Op when an accessibility action is performed.
Peter Visontay [Thu, 2 Nov 2017 20:32:03 +0000 (20:32 +0000)]
Log an App Op when an accessibility action is performed.

Bug: 63907873
Test: manually tested that the app op is being logged for TalkBack and a 3rd party accessibility service. Ran UIAutomator-based tests to check that they work as expected.
Change-Id: I1a40d4ead52ba2258cc7ddc8be594a13895d8340

6 years agoMerge "Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e am...
Android Build Merger (Role) [Fri, 15 Dec 2017 12:03:28 +0000 (12:03 +0000)]
Merge "Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e am: b4fb45f755"

6 years agoMerge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e
Philip P. Moltmann [Fri, 15 Dec 2017 11:59:37 +0000 (11:59 +0000)]
Merge "Switch to modern ArgumentMatchers" am: 343c512834 am: 3f5a8e019e
am: b4fb45f755

Change-Id: I6cecbe5ea337156f148a45e4c51782b62af96eda

6 years agoMerge "Remove non-junit android.test.runner classes from android.jar"
Paul Duffin [Fri, 15 Dec 2017 11:55:38 +0000 (11:55 +0000)]
Merge "Remove non-junit android.test.runner classes from android.jar"

6 years agoMerge "Log when an app shows a UI overlay."
Peter Visontay [Fri, 15 Dec 2017 11:20:38 +0000 (11:20 +0000)]
Merge "Log when an app shows a UI overlay."

6 years agoMerge "Implement RecoverableKeyStoreLoader loading keys into users' keystores"
Robert Berry [Fri, 15 Dec 2017 11:15:57 +0000 (11:15 +0000)]
Merge "Implement RecoverableKeyStoreLoader loading keys into users' keystores"

6 years agoMerge "Switch to modern ArgumentMatchers" am: 343c512834
Philip P. Moltmann [Fri, 15 Dec 2017 11:03:51 +0000 (11:03 +0000)]
Merge "Switch to modern ArgumentMatchers" am: 343c512834
am: 3f5a8e019e

Change-Id: I7103c06cf8c397a5ec2d536a4b7b16258f686244

6 years agoMerge "Switch to modern ArgumentMatchers"
Philip P. Moltmann [Fri, 15 Dec 2017 10:47:38 +0000 (10:47 +0000)]
Merge "Switch to modern ArgumentMatchers"
am: 343c512834

Change-Id: I25f39cefde34f5a27a9abf5d97fe94dcbcfee3cd

6 years agoMerge "Switch to modern ArgumentMatchers"
Treehugger Robot [Fri, 15 Dec 2017 10:33:14 +0000 (10:33 +0000)]
Merge "Switch to modern ArgumentMatchers"

6 years agoMerge "Improve testibility of applicatin switches."
TreeHugger Robot [Fri, 15 Dec 2017 10:00:26 +0000 (10:00 +0000)]
Merge "Improve testibility of applicatin switches."

6 years agoMerge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9...
Erik Kline [Fri, 15 Dec 2017 07:37:48 +0000 (07:37 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9 am: bb8c1a501a
am: 327462b2f7

Change-Id: Ie43fa6ffba91df2d38011d17008c8033ad29cf7b

6 years agoRemove non-junit android.test.runner classes from android.jar
Paul Duffin [Tue, 12 Dec 2017 16:16:26 +0000 (16:16 +0000)]
Remove non-junit android.test.runner classes from android.jar

This removes those android.test.** classes which are part of the
android.test.runner stubs jar from the main android.jar.

The junit classes will be removed at a later date. It cannot be done at
the moment because it requires a lot of changes to the build files.

This change is being done now rather than wait until they can all be
removed together because the code base is a moving target. Doing this
change minimizes the window during which other developers could either
revert the previous changes that make this possible or add new code that
relies on the android.test.runner classes being in android.jar and so
would require yet more changes.

Bug: 30188076
Test: make checkbuild
Change-Id: I4e3c3bfea77ce15ca7a9ba7d36aee5396f67affb

6 years agoMerge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9
Erik Kline [Fri, 15 Dec 2017 07:29:10 +0000 (07:29 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState."" am: e8a4cb13e9
am: bb8c1a501a

Change-Id: I78bd3c062e9ae89f43dda93ff0d8785cd2cbff70

6 years agoMerge "Revert "Send empty LinkProperties when entering StoppedState.""
Erik Kline [Fri, 15 Dec 2017 07:20:33 +0000 (07:20 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""
am: e8a4cb13e9

Change-Id: Ib8b889f0c80f90eff4d079ee7e0686ebd2812885

6 years agoMerge "Revert "Send empty LinkProperties when entering StoppedState.""
Erik Kline [Fri, 15 Dec 2017 07:09:24 +0000 (07:09 +0000)]
Merge "Revert "Send empty LinkProperties when entering StoppedState.""

6 years agoMerge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d am:...
Erik Kline [Fri, 15 Dec 2017 06:57:20 +0000 (06:57 +0000)]
Merge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d am: de336f18f9
am: d71ec3be6f

Change-Id: Ie775de7719bedc4fb0d1a50a3be6acad9651a9d9

6 years agoMerge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d
Erik Kline [Fri, 15 Dec 2017 06:49:11 +0000 (06:49 +0000)]
Merge "Send empty LinkProperties when entering StoppedState." am: 5557fe3e2d
am: de336f18f9

Change-Id: Ida8252c45d7e4680282b49f995fc564cb7227adf

6 years agoMerge "Send empty LinkProperties when entering StoppedState."
Erik Kline [Fri, 15 Dec 2017 06:39:22 +0000 (06:39 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."
am: 5557fe3e2d

Change-Id: I5b343fdd2da7f64284b4c4b357516320c8c81594

6 years agoRevert "Send empty LinkProperties when entering StoppedState."
Erik Kline [Fri, 15 Dec 2017 06:36:50 +0000 (06:36 +0000)]
Revert "Send empty LinkProperties when entering StoppedState."

This reverts commit 94209ab7686b202cfad6e42e07056bb9511006a8.

Reason for revert: should not have auto-submitted prior to more extensive wifi team testing.

Change-Id: Ie81b10473caf34971226948038bc20dc4fa6a1ae

6 years agoMerge "Send empty LinkProperties when entering StoppedState."
Treehugger Robot [Fri, 15 Dec 2017 06:29:15 +0000 (06:29 +0000)]
Merge "Send empty LinkProperties when entering StoppedState."

6 years agoMerge "Added compatibility WAL flags for Global.Settings"
Fyodor Kupolov [Fri, 15 Dec 2017 01:40:17 +0000 (01:40 +0000)]
Merge "Added compatibility WAL flags for Global.Settings"

6 years agoMerge "It's legit for AMS to throw IllegalArgumentException"
Chris Tate [Fri, 15 Dec 2017 01:30:58 +0000 (01:30 +0000)]
Merge "It's legit for AMS to throw IllegalArgumentException"

6 years agoMerge "Move task positioning tasks from WindowManagerService.mH"
TreeHugger Robot [Fri, 15 Dec 2017 01:24:34 +0000 (01:24 +0000)]
Merge "Move task positioning tasks from WindowManagerService.mH"

6 years agoMerge "Don't allow certain bucket overrides"
TreeHugger Robot [Fri, 15 Dec 2017 00:46:24 +0000 (00:46 +0000)]
Merge "Don't allow certain bucket overrides"

6 years agoMerge "Restore bounds w/o adjusting it."
TreeHugger Robot [Fri, 15 Dec 2017 00:33:31 +0000 (00:33 +0000)]
Merge "Restore bounds w/o adjusting it."

6 years agoMerge "Fix broken test due to API rename" am: 0abc93177f am: ee898c81a7
nharold [Thu, 14 Dec 2017 23:38:17 +0000 (23:38 +0000)]
Merge "Fix broken test due to API rename" am: 0abc93177f am: ee898c81a7
am: d569d33ac4

Change-Id: Ie52ce3da0507421313a73688e831d3802b888cfd

6 years agoMerge "clearCallingIdentity before calling into getPackageUidAsUser"
Tony Mak [Thu, 14 Dec 2017 23:29:33 +0000 (23:29 +0000)]
Merge "clearCallingIdentity before calling into getPackageUidAsUser"

6 years agoImprove testibility of applicatin switches.
Dianne Hackborn [Thu, 14 Dec 2017 01:52:26 +0000 (17:52 -0800)]
Improve testibility of applicatin switches.

Things can be flaky, because window focus changes are
dispatched to the window on a separate path from input events,
and the window will drop events if it gets them before it sees
the focus change.  I am trying to mitigate this some by noting
ASAP what the next upcoming focus state will be, so we can check
that and dispatch it before dispatching a key event if needed.

This definitely makes things better, but not perfect.  ctate
suggested that maybe we should be dispatching window focus events
through the input system, which at a glance sounds like a really
really good idea to me...  so maybe we can look at that later.

Also changed the wm command to just be a shell wrapper around
all of the implementation that is now in WindowManagerShellCommand.

And fixed a few places where we write debug info to streams that
would trigger strict mode violations that we really don't care
about.

Test: manual
Change-Id: I5235653bcec5522ab84c7f2e1de96d86f2f59326

6 years agoMerge "Fix broken test due to API rename" am: 0abc93177f
nharold [Thu, 14 Dec 2017 23:28:16 +0000 (23:28 +0000)]
Merge "Fix broken test due to API rename" am: 0abc93177f
am: ee898c81a7

Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a

6 years agoMerge "Fix broken test due to API rename"
nharold [Thu, 14 Dec 2017 23:20:11 +0000 (23:20 +0000)]
Merge "Fix broken test due to API rename"
am: 0abc93177f

Change-Id: I75a3f96e0d6d7cf05bbd8eb0dae03d114ac76f3e

6 years agoMerge "Fix broken test due to API rename"
Nathan Harold [Thu, 14 Dec 2017 23:14:57 +0000 (23:14 +0000)]
Merge "Fix broken test due to API rename"

6 years agoFix broken test due to API rename
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename

A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173

6 years agoMerge "Fix broken test due to API rename"
nharold [Thu, 14 Dec 2017 23:07:53 +0000 (23:07 +0000)]
Merge "Fix broken test due to API rename"

6 years agoFix broken test due to API rename
Nathan Harold [Thu, 14 Dec 2017 22:46:46 +0000 (14:46 -0800)]
Fix broken test due to API rename

A race condition during an Api rename has caused
the name change from reserveSecurityParameterIndex
to allocateSecurityParameterIndex to be wrong in
a test. Fixing.

Bug: 69128142
Test: runtest frameworks-net
Change-Id: I12fb9832cb938dc19f463b1f1124127435d7b173

6 years agoMerge "Merge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77 am: 5ad2fb...
Android Build Merger (Role) [Thu, 14 Dec 2017 22:58:07 +0000 (22:58 +0000)]
Merge "Merge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77 am: 5ad2fbabf8  -s ours"

6 years agoMerge "Add more owners"
TreeHugger Robot [Thu, 14 Dec 2017 22:57:43 +0000 (22:57 +0000)]
Merge "Add more owners"

6 years agoMerge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Confirmation code second try." am: df0f5e9791 am: cdc3c3ec77
am: 5ad2fbabf8  -s ours

Change-Id: I806e1dc1a2fa399db4578f6b5919dec70a313f7d

6 years agoMerge "Add RecoverableKeyStoreLoader APIs."
Dmitry Dementyev [Thu, 14 Dec 2017 22:50:44 +0000 (22:50 +0000)]
Merge "Add RecoverableKeyStoreLoader APIs."

6 years agoMerge "Confirmation code second try." am: df0f5e9791
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:46:29 +0000 (22:46 +0000)]
Merge "Confirmation code second try." am: df0f5e9791
am: cdc3c3ec77

Change-Id: I4c0de71e0c488551f6d0fa5e1f73ca2971e4a5f6

6 years agoMerge "Confirmation code second try."
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:37:58 +0000 (22:37 +0000)]
Merge "Confirmation code second try."
am: df0f5e9791

Change-Id: I426c5fcb2610cd1740fb9d6cd0a98a7bacfcb58a

6 years agoMerge "AAPT2: Enable mangled symbol lookup in AssetManagerSymbolTable"
Adam Lesinski [Thu, 14 Dec 2017 22:27:02 +0000 (22:27 +0000)]
Merge "AAPT2: Enable mangled symbol lookup in AssetManagerSymbolTable"

6 years agoMerge "Confirmation code second try."
Holly Jiuyu Sun [Thu, 14 Dec 2017 22:25:37 +0000 (22:25 +0000)]
Merge "Confirmation code second try."

6 years agoMerge "Add KeySyncUtils"
Robert Berry [Thu, 14 Dec 2017 22:00:21 +0000 (22:00 +0000)]
Merge "Add KeySyncUtils"

6 years agoMerge changes from topic "radio-2.0"
Tomasz Wasilczyk [Thu, 14 Dec 2017 21:57:14 +0000 (21:57 +0000)]
Merge changes from topic "radio-2.0"

* changes:
  Move HAL 1.x related service to its own directory.
  Initial implementation of HAL 2.0 counterpart for radio service.

6 years agoMerge "Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1...
Android Build Merger (Role) [Thu, 14 Dec 2017 21:50:52 +0000 (21:50 +0000)]
Merge "Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b am: f71c95dfe4"

6 years agoMerge "Adds hint summary to slice"
Mady Mellor [Thu, 14 Dec 2017 21:48:59 +0000 (21:48 +0000)]
Merge "Adds hint summary to slice"

6 years agoMerge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b
nharold [Thu, 14 Dec 2017 21:48:58 +0000 (21:48 +0000)]
Merge "Use consistent naming for allocating SPI." am: bf48afea49 am: 4753ed4b1b
am: f71c95dfe4

Change-Id: Ib6845ab0d7f385fbd1d59c0179771542e12c8be0

6 years agoMerge "Use consistent naming for allocating SPI." am: bf48afea49
nharold [Thu, 14 Dec 2017 21:36:32 +0000 (21:36 +0000)]
Merge "Use consistent naming for allocating SPI." am: bf48afea49
am: 4753ed4b1b

Change-Id: Ib5d89044313341790b1ee9271642072ddce181af

6 years agoMerge "Filter out position jitter in hover tooltip handling"
TreeHugger Robot [Thu, 14 Dec 2017 21:36:28 +0000 (21:36 +0000)]
Merge "Filter out position jitter in hover tooltip handling"

6 years agoMerge "Use consistent naming for allocating SPI."
nharold [Thu, 14 Dec 2017 21:21:06 +0000 (21:21 +0000)]
Merge "Use consistent naming for allocating SPI."
am: bf48afea49

Change-Id: I9adb5c14e91b33f09707c85c865cf2fc454f80ba

6 years agoMerge changes from topic "no-battery"
Todd Poynor [Thu, 14 Dec 2017 21:14:58 +0000 (21:14 +0000)]
Merge changes from topic "no-battery"

* changes:
  BatteryService: don't set battery low or critical states if no battery
  BatteryStats: Don't collect battery stats if no battery

6 years agoMerge "Use consistent naming for allocating SPI."
nharold [Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)]
Merge "Use consistent naming for allocating SPI."

6 years agoMove HAL 1.x related service to its own directory.
Tomasz Wasilczyk [Wed, 13 Dec 2017 19:47:20 +0000 (11:47 -0800)]
Move HAL 1.x related service to its own directory.

Bug: 69958777
Test: instrumentation
Change-Id: I4739568d9b1f32db7eebb7448f24f177ba2fc831

6 years agoInitial implementation of HAL 2.0 counterpart for radio service.
Tomasz Wasilczyk [Wed, 13 Dec 2017 16:26:25 +0000 (08:26 -0800)]
Initial implementation of HAL 2.0 counterpart for radio service.

Test: KitchenSink
Bug: 69958777
Change-Id: I7c697af76114e8c5d158ca592d2711b980101d60

6 years agoMerge "Further reduce statsd memory usage."
TreeHugger Robot [Thu, 14 Dec 2017 20:46:42 +0000 (20:46 +0000)]
Merge "Further reduce statsd memory usage."

6 years agoAdd RecoverableKeyStoreLoader APIs.
Dmitry Dementyev [Thu, 7 Dec 2017 03:05:33 +0000 (19:05 -0800)]
Add RecoverableKeyStoreLoader APIs.

Includes parcelables for
1) KeyDerivation
2) User Secret together with its type.
3) Application key entry
4) KeystoreRecoveryData block with all data  necessary to recover
keys later.

Test: none
Bug: 65979689
Change-Id: If59842a92ebbc0e77f95d6a2e5503943e2835062

6 years agoDon't allow certain bucket overrides
Amith Yamasani [Wed, 13 Dec 2017 19:52:10 +0000 (11:52 -0800)]
Don't allow certain bucket overrides

Don't allow EXEMPT to be overridden
Differentiate between shell and other callers who set
buckets.
Don't allow forced to be modified by bucketeer.
Don't allow bucketeer to modify NEVER bucket.

Fix a locking issue in listeners list. Don't use
the primary lock when calling out to listeners.

Fixes: 70622791
Fixes: 70622338

Test: atest FrameworksServicesTests:AppIdleHistoryTests
      atest FrameworksServicesTests:AppStandbyControllerTests
      atest CtsAppUsageHostTestCases
Change-Id: I22309478b947d6461235f5a77e08c7be86309e4b

6 years agoAdded compatibility WAL flags for Global.Settings
Fyodor Kupolov [Tue, 12 Dec 2017 19:52:57 +0000 (11:52 -0800)]
Added compatibility WAL flags for Global.Settings

Added Settings.Global.SQLITE_COMPATIBILITY_WAL_FLAGS -
configuration flags for SQLite Compatibility WAL. Encoded as a key-value
list, separated by commas. E.g.:
compatibility_wal_supported=true, wal_syncmode=OFF

SQLiteCompatibilityWalFlags caches the value of
SQLITE_COMPATIBILITY_WAL_FLAGS on first access and keeps it through
the lifetime of the process for consistent behavior across all
connections.

Test: SQLiteCompatibilityWalFlagsTest
Test: setting put global ... + verify that dumpsys dbinfo has the new flag
Bug: 70226732
Bug: 70517616
Change-Id: Ifacbf5908c83351ebe5dea676eeb716af039fb14

6 years agoMerge "Merge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b am: 8e50922...
Android Build Merger (Role) [Thu, 14 Dec 2017 20:09:08 +0000 (20:09 +0000)]
Merge "Merge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b am: 8e50922263  -s ours"

6 years agoMerge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b
Mathieu Chartier [Thu, 14 Dec 2017 20:07:10 +0000 (20:07 +0000)]
Merge "Remove compiled classes list" am: 3adfec2de3 am: 3a3fc7a43b
am: 8e50922263  -s ours

Change-Id: I2dd835282a9de847cd3e5fd0e5a0e54bff2538af

6 years agoMerge "Do not show keyguard dialogs on AoD."
TreeHugger Robot [Thu, 14 Dec 2017 20:05:47 +0000 (20:05 +0000)]
Merge "Do not show keyguard dialogs on AoD."

6 years agoMerge "DevicePolicyManager: Support attestation for generated keys."
Eran Messeri [Thu, 14 Dec 2017 20:04:42 +0000 (20:04 +0000)]
Merge "DevicePolicyManager: Support attestation for generated keys."

6 years agoMerge "Remove compiled classes list" am: 3adfec2de3
Mathieu Chartier [Thu, 14 Dec 2017 19:57:14 +0000 (19:57 +0000)]
Merge "Remove compiled classes list" am: 3adfec2de3
am: 3a3fc7a43b

Change-Id: Ia40246372d156d308c4e3930c3789dfe0a1010f8

6 years agoMerge "Remove compiled classes list"
Mathieu Chartier [Thu, 14 Dec 2017 19:44:50 +0000 (19:44 +0000)]
Merge "Remove compiled classes list"
am: 3adfec2de3

Change-Id: I98d29b9f3aeeaf78ba93b631b0746cc37ac9e7e5

6 years agoMerge "Fix regression in task trimming"
Winson Chung [Thu, 14 Dec 2017 19:42:20 +0000 (19:42 +0000)]
Merge "Fix regression in task trimming"

6 years agoMerge "Fix some issues found in AM display tests"
Andrii Kulian [Thu, 14 Dec 2017 19:32:07 +0000 (19:32 +0000)]
Merge "Fix some issues found in AM display tests"

6 years agoAdd more owners
Wyatt Riley [Thu, 14 Dec 2017 19:17:56 +0000 (11:17 -0800)]
Add more owners

Test: Treehugger only
Change-Id: I873e6f3f94f00e8ed1294bbb4a917b1225e34b09

6 years agoMerge "Remove compiled classes list"
Treehugger Robot [Thu, 14 Dec 2017 19:16:47 +0000 (19:16 +0000)]
Merge "Remove compiled classes list"

6 years agoMerge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8 am:...
Jeff Davidson [Thu, 14 Dec 2017 19:01:49 +0000 (19:01 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8 am: 67c9a43605
am: 059f59cc70  -s ours

Change-Id: I01e484836f1ac335414acba266b0abb6e191bedc

6 years agoMerge "Fix flaky WifiTrackerTest"
Michael Plass [Thu, 14 Dec 2017 18:48:16 +0000 (18:48 +0000)]
Merge "Fix flaky WifiTrackerTest"

6 years agoBatteryService: don't set battery low or critical states if no battery
Todd Poynor [Fri, 8 Dec 2017 18:44:40 +0000 (10:44 -0800)]
BatteryService: don't set battery low or critical states if no battery

If device has no battery then never set states "battery low" or
"battery critical".

Bug: 34507420
Test: manual: inspection (with hack to disappear the battery device)
Change-Id: I1eee79032507121de2fa7bf29d1359a29f21d3d0

6 years agoBatteryStats: Don't collect battery stats if no battery
Todd Poynor [Fri, 8 Dec 2017 03:19:35 +0000 (19:19 -0800)]
BatteryStats: Don't collect battery stats if no battery

If the device has no battery, or has a removeable battery that is
currently removed, do not collect battery statistics.

Bug: 34507420
Test: manual: dumpsys batterystats
Change-Id: Id8edb494f353a40c648f798690f611f89f464d34

6 years agoMerge "WebView: Clarify documentation about mimeTypes"
James Wallace-Lee [Thu, 14 Dec 2017 18:40:12 +0000 (18:40 +0000)]
Merge "WebView: Clarify documentation about mimeTypes"

6 years agoLog when an app shows a UI overlay.
Peter Visontay [Mon, 11 Dec 2017 18:50:03 +0000 (18:50 +0000)]
Log when an app shows a UI overlay.

Bug: 63907873
Test: manually checked that the op is logged when an app shows an overlay.
Change-Id: I932a394a6d829a6a48d17e9d8c00e3e66623bd43

6 years agoMerge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8
Jeff Davidson [Thu, 14 Dec 2017 18:26:04 +0000 (18:26 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc." am: 6e41b2c5c8
am: 67c9a43605

Change-Id: If333cd7cee4785779cdd4acc8421059c4a947dd2

6 years agoMerge "Update PhoneStateListener#onCallStateChanged Javadoc."
Jeff Davidson [Thu, 14 Dec 2017 18:11:26 +0000 (18:11 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."
am: 6e41b2c5c8

Change-Id: I9fd9ab01b770fc8a1c5998d3a4c3e824123e2076

6 years agoDevicePolicyManager: Support attestation for generated keys.
Eran Messeri [Mon, 11 Dec 2017 17:48:47 +0000 (17:48 +0000)]
DevicePolicyManager: Support attestation for generated keys.

If the KeyGenParameterSpec passed into
DevicePolicyManager.generateKeyPair contains an attestation challenge,
request an attestation record for the newly-generated key with the
challenge provided.

This particular implementation was chosen, rather than letting the
attestation record be generated at the same time as key generation, to
avoid having the attestation chain stored in Keystore and associated
with the generated alias.

The rationale is that this is a key that is potentially accessible by
multiple applications and the attestation chain may end up being sent
as a TLS client certificate chain, for example.

As the attestation challenge should be unique per device, to avoid
the potential of sending / sharing unique device information, by
explicitly requesting an attestation record after key generation, the
attestation record is only returned to the generateKeyPair client and
not persistend in Keystore.

Bug: 63388672
Test: New CTS test to be run with: 'cts-tradefed run commandAndExit cts-dev -a armeabi-v7a -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testKeyManagement -l DEBUG'
Change-Id: I95a9aef179173b571b533301ac438c675e8fe702

6 years agoMerge "Remove compiled classes list"
Mathieu Chartier [Thu, 14 Dec 2017 18:02:55 +0000 (18:02 +0000)]
Merge "Remove compiled classes list"

6 years agoMerge "Update PhoneStateListener#onCallStateChanged Javadoc."
Treehugger Robot [Thu, 14 Dec 2017 17:52:27 +0000 (17:52 +0000)]
Merge "Update PhoneStateListener#onCallStateChanged Javadoc."

6 years agoSwitch to modern ArgumentMatchers
Philip P. Moltmann [Mon, 27 Nov 2017 20:29:20 +0000 (12:29 -0800)]
Switch to modern ArgumentMatchers

Test: - adb shell am instrument -w -e class com.android.mediaframeworktest.unit.MediaInserterTest com.android.mediaframeworktest/android.support.test.runner.AndroidJUnitRunner
      - atest com.android.settingslib.users.AppRestrictionsHelperTest
      - atest com.android.server.NetworkScorerAppManagerTest com.android.server.accessibility.MotionEventInjectorTest com.android.server.webkit.WebViewUpdateServiceTest
Change-Id: I6d4c543541d3bebcd65e5aa9e3f4d9a0152d5583

6 years agoRemove compiled classes list
Mathieu Chartier [Tue, 12 Dec 2017 19:17:01 +0000 (11:17 -0800)]
Remove compiled classes list

No longer used.

(cherry-picked from commit c87f8124bc1b79969f512f67d5d7f837b4cf28f7)

Bug: 37966211
Test: make
Merged-In: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9
Change-Id: I5a1ef82ed6d8cf771513b86960c3d1d8cf7418f9

6 years agoFurther reduce statsd memory usage.
Yao Chen [Thu, 14 Dec 2017 01:00:51 +0000 (17:00 -0800)]
Further reduce statsd memory usage.

+ Remove the protobuf *Metric object from MetricProducers
   -- This saves ~150 bytes per metric.
+ Remove the StatsdConfig from ConfigManager
   -- This saves us xKB per config.
+ Also remove alerts from fake config to avoid crash (Bug: 70627390)
+ Other misc fixes too.

Test: statsd_test & manual
Change-Id: Ied4eb3fa31c50599817b3a5e1caf5077c487fad2

6 years agoMerge "use running sum for ValueMetricProducer bucket simplify ValueMetricProducer...
TreeHugger Robot [Thu, 14 Dec 2017 17:05:20 +0000 (17:05 +0000)]
Merge "use running sum for ValueMetricProducer bucket simplify ValueMetricProducer logic for pulled data"

6 years agoMerge "input cmds: fix keyevent not support sources parameter" am: 11ec2eb118 am...
gaoshang [Thu, 14 Dec 2017 16:55:21 +0000 (16:55 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am: 11ec2eb118 am: 4f697fe574
am: b5a913cce3

Change-Id: Idcaa642e763284dfde7b52f2f87e28796675b127

6 years agoMerge "[AWARE] Check for RTT feature presence for Aware discovery with ranging"
TreeHugger Robot [Thu, 14 Dec 2017 16:48:12 +0000 (16:48 +0000)]
Merge "[AWARE] Check for RTT feature presence for Aware discovery with ranging"

6 years agoMerge "input cmds: fix keyevent not support sources parameter" am: 11ec2eb118
gaoshang [Thu, 14 Dec 2017 16:37:08 +0000 (16:37 +0000)]
Merge "input cmds: fix keyevent not support sources parameter" am: 11ec2eb118
am: 4f697fe574

Change-Id: Ice43c79858930ccc48b9470152e0af2d99e966ae

6 years agoUpdate PhoneStateListener#onCallStateChanged Javadoc.
Jeff Davidson [Fri, 10 Nov 2017 23:58:20 +0000 (15:58 -0800)]
Update PhoneStateListener#onCallStateChanged Javadoc.

While the doc suggested that the phone number was "incoming" (e.g.
only populated for incoming calls), it should also be populated for
outgoing calls.

Bug: 67748129
Test: Verified expected behavior on Taimen running OC-MR1, added CTS
test (see other CL in this topic)
Change-Id: I1ddd9c042f287953358a794b91b2af5ed6f5b597
Merged-In: I1ddd9c042f287953358a794b91b2af5ed6f5b597

6 years agoMerge "Only allow the top fullscreen stack to influence lockscreen state"
TreeHugger Robot [Thu, 14 Dec 2017 16:28:11 +0000 (16:28 +0000)]
Merge "Only allow the top fullscreen stack to influence lockscreen state"

6 years agoMerge "input cmds: fix keyevent not support sources parameter"
gaoshang [Thu, 14 Dec 2017 16:26:46 +0000 (16:26 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"
am: 11ec2eb118

Change-Id: I7e527a58332a4453fe104538e55a60a444602159

6 years agoMerge "input cmds: fix keyevent not support sources parameter"
Treehugger Robot [Thu, 14 Dec 2017 16:14:34 +0000 (16:14 +0000)]
Merge "input cmds: fix keyevent not support sources parameter"

6 years agoMerge "Fix window movement animations."
TreeHugger Robot [Thu, 14 Dec 2017 15:29:49 +0000 (15:29 +0000)]
Merge "Fix window movement animations."

6 years agoMerge "Add profile owner transfer functionality."
Antoan Angelov [Thu, 14 Dec 2017 15:09:05 +0000 (15:09 +0000)]
Merge "Add profile owner transfer functionality."

6 years agoMerge "Log an App Op when an accessibility service is registered."
Peter Visontay [Thu, 14 Dec 2017 15:07:58 +0000 (15:07 +0000)]
Merge "Log an App Op when an accessibility service is registered."

6 years agoMerge "Add WebView Tracing API."
TreeHugger Robot [Thu, 14 Dec 2017 15:07:24 +0000 (15:07 +0000)]
Merge "Add WebView Tracing API."

6 years agoOnly allow the top fullscreen stack to influence lockscreen state
Wale Ogunwale [Mon, 11 Dec 2017 16:40:13 +0000 (08:40 -0800)]
Only allow the top fullscreen stack to influence lockscreen state

Only activities in the top fullscreen stack should be able to
showWhenLocked or dismiss the keyguard.
Also, use ActivityRecord.visibleIgnoringKeyguard to determine if a
stack is translucent instead of AR.visible.

Bug: 68689819
Bug: 70562363
Test: manual steps from bug
Change-Id: Ib13395198d00366df13f34d4642a1a163b9d2435

6 years agoMerge "Add an output chooser dialog to volume panel"
TreeHugger Robot [Thu, 14 Dec 2017 13:52:11 +0000 (13:52 +0000)]
Merge "Add an output chooser dialog to volume panel"

6 years agoFix window movement animations.
Jorim Jaggi [Thu, 14 Dec 2017 13:40:48 +0000 (14:40 +0100)]
Fix window movement animations.

Surface insets/parent calculation wasn't used when calculating
the positions for movement animations.

Test: go/wm-smoke
Test: Go to Wifi setting, click on a WIFI with pw, open/close IME
to observe window movement animation.
Bug: 64674361

Change-Id: Iffd98d8f946c2fc2dcb5adb176bb890d8a3fc374

6 years agoclearCallingIdentity before calling into getPackageUidAsUser
Tony Mak [Thu, 14 Dec 2017 12:40:07 +0000 (12:40 +0000)]
clearCallingIdentity before calling into getPackageUidAsUser

Fix: 70585244

Test: Enable any accessibility service -> inflate work profile
      -> Tap on any work app -> no longer crash

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest.testPrimaryUserToManagedProfile
Change-Id: I80d18f4e2ab76a228cb0aa2c8312c323a9b5c84d

6 years agoMerge changes from topic "lock_free_win"
Jorim Jaggi [Thu, 14 Dec 2017 13:36:27 +0000 (13:36 +0000)]
Merge changes from topic "lock_free_win"

* changes:
  Fix minor issues with new window animations.
  Fix possible race conditions when cancelling animations
  Lock free animations (2/2)