OSDN Git Service

android-x86/frameworks-base.git
6 years agoAdd platform key generation ID to WrappedKey instances
Robert Berry [Thu, 14 Dec 2017 17:04:07 +0000 (17:04 +0000)]
Add platform key generation ID to WrappedKey instances

This is so that when we persist them, we can tell that they were wrapped
with a specific version of the platform key. This will be useful for us
to provide error messages to the users of recoverable keys. (i.e., in
the case where the user had an application key that was wrapped with a
platform key that is no longer valid, they MUST rotate key.)

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I91569bcaf23b49d89a9caa9d313d9c93952b620d

6 years agoMerge "Throw on attempt to unwrap a WrappedKey with old PlatformKey"
Robert Berry [Sat, 16 Dec 2017 22:54:17 +0000 (22:54 +0000)]
Merge "Throw on attempt to unwrap a WrappedKey with old PlatformKey"

6 years agoMerge "Log if reading cpu freq times takes too long."
Sudheer Shanka [Sat, 16 Dec 2017 20:12:40 +0000 (20:12 +0000)]
Merge "Log if reading cpu freq times takes too long."

6 years agoMerge "Start processes asynchronously in AMS."
Sudheer Shanka [Sat, 16 Dec 2017 18:36:48 +0000 (18:36 +0000)]
Merge "Start processes asynchronously in AMS."

6 years agoMerge "Global app standby flag"
TreeHugger Robot [Sat, 16 Dec 2017 18:30:23 +0000 (18:30 +0000)]
Merge "Global app standby flag"

6 years agoMerge "Make IMM more robust for window focus stealing"
TreeHugger Robot [Sat, 16 Dec 2017 18:23:40 +0000 (18:23 +0000)]
Merge "Make IMM more robust for window focus stealing"

6 years agoGlobal app standby flag
Amith Yamasani [Fri, 15 Dec 2017 18:51:53 +0000 (10:51 -0800)]
Global app standby flag

Disable app standby features if app_standby_enabled
is set to 0. This allows for UI and experiments to
control the feature.

Bug: 70655630
Test: adb shell settings put global app_standby_enabled 0
      adb shell dumpsys usagestats
      adb shell am get-standby-bucket <packagename>

Change-Id: Id6c62b078e52040767100f2997832cc586bb0806

6 years agoMerge "Revert "Log an App Op when an accessibility action is performed.""
TreeHugger Robot [Sat, 16 Dec 2017 11:57:25 +0000 (11:57 +0000)]
Merge "Revert "Log an App Op when an accessibility action is performed.""

6 years agoThrow on attempt to unwrap a WrappedKey with old PlatformKey
Robert Berry [Fri, 15 Dec 2017 15:25:01 +0000 (15:25 +0000)]
Throw on attempt to unwrap a WrappedKey with old PlatformKey

Also brings the decrypt key inline with the representation in
ag/3362855. When getting the latest decrypt/encrypt key we will
always want to know the generation ID, so that we can either
persist that information with the WrappedKey, or check against
WrappedKeys we're attempting to decrypt. As such it makes sense
to have methods return a class that wraps the key and ID, as they
always belong together.

Test: adb shell am instrument -w -e package com.android.server.locksettings.recoverablekeystore com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2c7e97af9ed87216ff2f133a1e3efd546431ab7e

6 years agoMerge "Remove recents button and longpress home when connected to service (1/2)"
TreeHugger Robot [Sat, 16 Dec 2017 04:29:35 +0000 (04:29 +0000)]
Merge "Remove recents button and longpress home when connected to service (1/2)"

6 years agoMerge "Allow interval updating when no GPS fix & scheduling not supported."
Mohammed Khider [Sat, 16 Dec 2017 04:19:23 +0000 (04:19 +0000)]
Merge "Allow interval updating when no GPS fix & scheduling not supported."

6 years agoMerge "Stats log api for attribution chain."
TreeHugger Robot [Sat, 16 Dec 2017 04:15:11 +0000 (04:15 +0000)]
Merge "Stats log api for attribution chain."

6 years agoMerge "Map "shell ime" to "shell cmd input_method ime""
TreeHugger Robot [Sat, 16 Dec 2017 03:40:10 +0000 (03:40 +0000)]
Merge "Map "shell ime" to "shell cmd input_method ime""

6 years agoMerge "bugfix: adjust StatsLogEventWrapper length to make sure we don't lose data"
TreeHugger Robot [Sat, 16 Dec 2017 03:15:59 +0000 (03:15 +0000)]
Merge "bugfix: adjust StatsLogEventWrapper length to make sure we don't lose data"

6 years agoMerge "Log daveys"
TreeHugger Robot [Sat, 16 Dec 2017 02:55:35 +0000 (02:55 +0000)]
Merge "Log daveys"

6 years agoMerge "Added back the recents button to activity over lockscreen"
TreeHugger Robot [Sat, 16 Dec 2017 02:50:40 +0000 (02:50 +0000)]
Merge "Added back the recents button to activity over lockscreen"

6 years agoMerge "Delay touching disks when secure keyguard showing."
Jeff Sharkey [Sat, 16 Dec 2017 02:20:32 +0000 (02:20 +0000)]
Merge "Delay touching disks when secure keyguard showing."

6 years agoAllow interval updating when no GPS fix & scheduling not supported.
gomo [Thu, 14 Dec 2017 03:04:12 +0000 (19:04 -0800)]
Allow interval updating when no GPS fix & scheduling not supported.

Since Android-L we have the following isse for GPS chipsets that do not
have GPS_CAPABILITY_SCHEDULING:
1) A location request is ongoing with an interval < 1 minute that
mFixInterval < NO_FIX_TIMEOUT. In which case, the TimeOutIntent will
not be set
2) A new location request arrives with a large interval where we want
the TimeOutIntent to kick in if needed
3) The above scenario has to happen in GPS signal denied environment
with no fix possible as a single reported location will cause hibernate()
to be called and engine to be stopped

Bug:68827168
Test: Current tests pass.

Change-Id: I4b3abf4b6f91a8eeb119bdbdb19f2fb0ed9e28cd

6 years agoLog daveys
John Reck [Sat, 16 Dec 2017 00:00:48 +0000 (16:00 -0800)]
Log daveys

Bug: 70339576
Test: Checked that it logged with a lower threshold
Change-Id: I271f8af2a3ee63769edc71291b70f19512974d78

6 years agoMerge "Made Autofill Field Classification API public and documented it."
TreeHugger Robot [Sat, 16 Dec 2017 00:57:50 +0000 (00:57 +0000)]
Merge "Made Autofill Field Classification API public and documented it."

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 agoStats log api for attribution chain.
Yangster-mac [Tue, 12 Dec 2017 06:55:49 +0000 (22:55 -0800)]
Stats log api for attribution chain.

Test: all unit test passed.
Change-Id: I628d409e517f4f95c8da1d0c7fd4d514c1d9196d

6 years agoMap "shell ime" to "shell cmd input_method ime"
Yohei Yukawa [Sat, 16 Dec 2017 00:52:05 +0000 (16:52 -0800)]
Map "shell ime" to "shell cmd input_method ime"

This is a follow up CL to my following CLs:
 * Use IBinder#shellCommand() for 'adb shell ime' [1]
 * Add a shell command to reset selected/enabled IMEs [2]

Previously
  adb shell ime <command>
was an alias of
  adb shell cmd input_method <command>

With this CL,
  adb shell ime <command>
is now an alias of
  adb shell cmd input_method ime <command>

This allows us to rename a sub command "reset-ime" to "reset" without
worrying about ambiguity about what will be reset.

Note also that the built-in "dump" command now works only as
  shell cmd input_method dump

 [1]: I9a2dbbf1d4494addbe22c82e2c416eedc4d585f2
      926488d70d09baefee0489537b2915602deaeebf
 [2]: I1e27aa1c9edf5d9a6d529c469ad42fd1e42b13b1
      cc97ebd031b4d4be6f69e3163c362bce6878baf1

Bug: 70475949
Fixes: 70731324
Test: Manually tested as follows.
  1. make -j SoftKeyboard
  2. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  3. adb shell ime enable com.example.android.softkeyboard/.SoftKeyboard
  4. adb shell ime set com.example.android.softkeyboard/.SoftKeyboard
  5. Make sure that SoftKeyboard is enabled and selected
  6. adb shell ime reset
  7. Make sure that SoftKeyboard is no longer enabled and selected
Change-Id: I2a325dcd6108e357420d47880e4cbd9f81670ec9

6 years agoMerge "Minimal reformat to match internal master." am: 0d75603ea7 am: 5df94f6c14
Elliott Hughes [Sat, 16 Dec 2017 00:47:55 +0000 (00:47 +0000)]
Merge "Minimal reformat to match internal " am: 0d75603ea7 am: 5df94f6c14
am: 98202d9c6a

Change-Id: I990a0933fe9d50a98919452f7f0513d6f036a637

6 years agoMerge "Minimal reformat to match internal master." am: 0d75603ea7
Elliott Hughes [Sat, 16 Dec 2017 00:40:08 +0000 (00:40 +0000)]
Merge "Minimal reformat to match internal " am: 0d75603ea7
am: 5df94f6c14

Change-Id: I33cc16e2a9ecd91e97b0824834760f88b13cac2e

6 years agoMerge "Minimal reformat to match internal master."
Elliott Hughes [Sat, 16 Dec 2017 00:32:22 +0000 (00:32 +0000)]
Merge "Minimal reformat to match internal master."
am: 0d75603ea7

Change-Id: I0447a57265c8a73f40dc6f75964516d31f175165

6 years agoMerge "Fix temporary file name strlcpy size."
Ivan Lozano [Sat, 16 Dec 2017 00:24:47 +0000 (00:24 +0000)]
Merge "Fix temporary file name strlcpy size."

6 years agoMerge "Minimal reformat to match internal master."
Elliott Hughes [Sat, 16 Dec 2017 00:15:02 +0000 (00:15 +0000)]
Merge "Minimal reformat to match internal master."

6 years agoMerge "Adds API for apps to push events to statsd."
TreeHugger Robot [Sat, 16 Dec 2017 00:03:53 +0000 (00:03 +0000)]
Merge "Adds API for apps to push events to statsd."

6 years agoMerge "Add hints for toggles in Slice"
TreeHugger Robot [Sat, 16 Dec 2017 00:00:26 +0000 (00:00 +0000)]
Merge "Add hints for toggles in Slice"

6 years agoMerge "Notify system when uiAutomation terminates"
Phil Weaver [Sat, 16 Dec 2017 00:00:12 +0000 (00:00 +0000)]
Merge "Notify system when uiAutomation terminates"

6 years agoMerge "Consolidate Keystore alias prefixes."
Janis Danisevskis [Fri, 15 Dec 2017 23:48:55 +0000 (23:48 +0000)]
Merge "Consolidate Keystore alias prefixes."

6 years agoMerge "Add android.test.base/stubs dependency"
TreeHugger Robot [Fri, 15 Dec 2017 23:47:40 +0000 (23:47 +0000)]
Merge "Add android.test.base/stubs dependency"

6 years agoMake IMM more robust for window focus stealing
Yohei Yukawa [Fri, 15 Dec 2017 23:47:33 +0000 (15:47 -0800)]
Make IMM more robust for window focus stealing

This CL is a generalized version of my previous CL [1], which addresed
Bug 31056744 where InputMethodManager (IMM) fails to recover from
failure mode when IMMS#startInputOrWindowGainedFocus() failes because
the app's window is no longer eligible to be the IME target.

This CL finally addressed one TODO in that CL. InputBindResult now has
the error code, which allows us to force restart input upon the next
window-focus-in event.  This should make IMM much more robust for
that kind of failure modes.  For instance, Bug 70629102 is fixed as
demonstrated in a newly added CTS test case [2].  Hopefully this may
also fix Bug 31056744, which we still do not know how to reproduce.

 [1]: I60adb38013b063918b074c7b947649eada77b2c8
      8e9214b4bd7e6a9d944ad1527199226e575a7530
 [2]: I4ea24c87cbbd05e4e68ad7dfafb774c8520188e2

Bug: 31056744
Fixes: 70629102
Test: Added a test case for Bug 70629102
      atest CtsInputMethodTestCases
Test: Manually made sure that Bug 28281870 is still fixed:
      1. Open app that has EditText.
      2. Start Input.
      3. Long press the task switch button to start multi-window mode.
      4. Tap the EditText that is used in step 2.
      5. Make sure that the IME still works as expected
Test: atest CtsViewTestCates
Change-Id: I7572d4b9d678f3669ca54d55718877b145015777

6 years agobugfix: adjust StatsLogEventWrapper length to make sure we don't
Chenjie Yu [Fri, 15 Dec 2017 22:45:41 +0000 (14:45 -0800)]
bugfix: adjust StatsLogEventWrapper length to make sure we don't
lose data

Test: manual test
Change-Id: I7bf014e7e2007e0e065aa7ca99522d9effcf1a68

6 years agoRemove recents button and longpress home when connected to service (1/2)
Matthew Ng [Fri, 15 Dec 2017 01:37:35 +0000 (17:37 -0800)]
Remove recents button and longpress home when connected to service (1/2)

When overview is connected to the launcher service, long press to launch
assistant, the diamond animation and the recents button will be
removed.

Test: manual - enable new experience in launcher settings
Bug: 67957962
Change-Id: I8e976ae36465476e6287e0c1190cd2964099bbc6

6 years agoMerge "Dump services permissions on 'package' service."
TreeHugger Robot [Fri, 15 Dec 2017 22:25:33 +0000 (22:25 +0000)]
Merge "Dump services permissions on 'package' service."

6 years agoMerge "Fixed create app shortcut text and icon alignment in RTL Language" am: 29f61c2...
susanta.patra [Fri, 15 Dec 2017 22:24:46 +0000 (22:24 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language" am: 29f61c21f4 am: c1a2cd2175
am: acbb9830c1

Change-Id: I3aa27e3e6d744a27ff4ee2ad9f1de7fc181f4c38

6 years agoMerge "Fixed create app shortcut text and icon alignment in RTL Language" am: 29f61c21f4
susanta.patra [Fri, 15 Dec 2017 22:16:02 +0000 (22:16 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language" am: 29f61c21f4
am: c1a2cd2175

Change-Id: Id0fc2be3255620089a632236af2997213a9d6003

6 years agoMerge "Update documentation for DIRTY in VoicemailContract"
TreeHugger Robot [Fri, 15 Dec 2017 22:11:47 +0000 (22:11 +0000)]
Merge "Update documentation for DIRTY in VoicemailContract"

6 years agoMerge "Fixed create app shortcut text and icon alignment in RTL Language"
susanta.patra [Fri, 15 Dec 2017 22:10:00 +0000 (22:10 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language"
am: 29f61c21f4

Change-Id: Iaa0829e9844278731e403e13b2cc8a3400969bb4

6 years agoMerge "Update documentation for preferred phone account columns"
TreeHugger Robot [Fri, 15 Dec 2017 22:02:17 +0000 (22:02 +0000)]
Merge "Update documentation for preferred phone account columns"

6 years agoMerge "Fixed create app shortcut text and icon alignment in RTL Language"
Treehugger Robot [Fri, 15 Dec 2017 21:58:07 +0000 (21:58 +0000)]
Merge "Fixed create app shortcut text and icon alignment in RTL Language"

6 years agoMerge "Improved Cell Broadcast debug messages."
TreeHugger Robot [Fri, 15 Dec 2017 21:56:39 +0000 (21:56 +0000)]
Merge "Improved Cell Broadcast debug messages."

6 years agoMerge "Move EntropyMixer I/O from main thread to I/O thread"
Alex Klyubin [Fri, 15 Dec 2017 21:34:59 +0000 (21:34 +0000)]
Merge "Move EntropyMixer I/O from main thread to I/O thread"

6 years agoMerge "For loop condition fix"
Todd Kennedy [Fri, 15 Dec 2017 21:04:34 +0000 (21:04 +0000)]
Merge "For loop condition fix"

6 years agoMerge "Turn on connected device by default"
TreeHugger Robot [Fri, 15 Dec 2017 21:02:01 +0000 (21:02 +0000)]
Merge "Turn on connected device by default"

6 years agoMerge "Statsd value metric anomaly detection"
TreeHugger Robot [Fri, 15 Dec 2017 20:53:43 +0000 (20:53 +0000)]
Merge "Statsd value metric anomaly detection"

6 years agoMerge "Add hostdex target for android.test.base"
TreeHugger Robot [Fri, 15 Dec 2017 20:52:20 +0000 (20:52 +0000)]
Merge "Add hostdex target for android.test.base"

6 years agoDelay touching disks when secure keyguard showing.
Jeff Sharkey [Fri, 15 Dec 2017 05:15:14 +0000 (22:15 -0700)]
Delay touching disks when secure keyguard showing.

We've tried our best to protect against malicious storage devices
with limited SELinux domains, but let's be even more paranoid and
refuse to look at disks inserted while a secure keyguard is
showing.  We'll gladly scan them right away once the user confirms
their credentials.

Test: builds, boots, manual testing
Bug: 68054513
Change-Id: I19b7446e855176921ed477ef6d07bc9a2cc0ef9a

6 years agodocs: Added code tag to meta-data name and fixed some @see tags am: f2a8aea735
Ricardo Loo Foronda [Fri, 15 Dec 2017 20:38:54 +0000 (20:38 +0000)]
docs: Added code tag to meta-data name and fixed some @see tags am: f2a8aea735
am: 0d69f1b342

Change-Id: Ib0e6d759d002cf5418755312c42e32e07ece0576

6 years agodocs: Added code tag to meta-data name and fixed some @see tags
Ricardo Loo Foronda [Fri, 15 Dec 2017 20:31:18 +0000 (20:31 +0000)]
docs: Added code tag to meta-data name and fixed some @see tags
am: f2a8aea735

Change-Id: If5601165a816e0dadc672008f8d5049563ee577f

6 years agoStart processes asynchronously in AMS.
Sudheer Shanka [Mon, 16 Oct 2017 17:20:32 +0000 (10:20 -0700)]
Start processes asynchronously in AMS.

Currently, process start is initiated in ActivityManagerService
holding the main lock and this takes ~40ms to complete. As seen
in some of the issues in previous releases, this is one of the
contributors of the lock contention in system_server. This change
tries to address this issue by moving the process start outside
the locked section.

When a process start is required, instead of doing it synchronously,
this request will be posted on a handler thread. On the handler thread,
this process start request will be completed without holding a lock.
If for some reason, we decide the process is not needed anymore before
it is actually started or being started, then AMS does everything as
usual removing the references to the process from internal state except
actually killing the process which will be handled on the handler
thread.

Bug: 68775202
Test: Ran app startup perf tests using forrest, will update the bug with results.
Test: https://docs.google.com/spreadsheets/d/1cW81guRALZXKsN-WZsKyQiCSY-RgkJ2m_M9IfqIquz8
Test: cts-tradefed run singleCommand cts-dev -m CtsActivityManagerDeviceTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsWindowManagerDeviceTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsAppTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsMultiUserHostTestCases
Test: adb shell am instrument -e package com.android.server.am -w \
      com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -e class com.android.server.pm.UserManagerTest -w \
      com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -e package android.content -w \
      com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: cts-tradefed run singleCommand cts-dev -m CtsProviderTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsContentTestCases -t \
      android.content.cts.ContentResolverTest
Test: cts-tradefed run singleCommand cts-dev -m CtsContentTestCases -t \
      android.content.cts.ContentProviderTest
Test: cts-tradefed run singleCommand cts-dev -m CtsWebkitTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideWebViewTests
Test: cts-tradefed run singleCommand cts-dev -m CtsAssistTestCases
Test: make WebViewLoadingTests && make tradefed-all && tradefed.sh \
      run template/local_min --template:map test=WebViewLoadingTests
Test: adb shell setprop wrap.com.google.android.apps.maps \
      '"LIBC_DEBUG_MALLOC_OPTIONS=backtrace logwrapper"'
      && adb shell dumpsys meminfo --unreachable <PID_OF_APP>
      && check ppid of <APP> is logwrapper's pid.
Test: cts-tradefed run singleCommand cts-dev -m CtsWrapWrapNoDebugTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsWrapWrapDebugTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsWrapNoWrapTestCases
Test: cts-tradefed run singleCommand cts-dev -m CtsWrapWrapDebugMallocDebugTestCases
Test: manual

Change-Id: I1fe7ce48cd5a4aadccaf6b3d6fdb5cad3304f1d3

6 years agoMerge "Use iterator to remove elements from cache"
TreeHugger Robot [Fri, 15 Dec 2017 20:17:45 +0000 (20:17 +0000)]
Merge "Use iterator to remove elements from cache"

6 years agoUpdate documentation for preferred phone account columns
Ta-wei Yen [Wed, 13 Dec 2017 23:25:49 +0000 (15:25 -0800)]
Update documentation for preferred phone account columns

Fixes: 70299454
Test: N/A
Change-Id: Ib8af85b5c618c1a2c62bc6c09daae057521de5d6

6 years agoUpdate documentation for DIRTY in VoicemailContract
Ta-wei Yen [Fri, 15 Dec 2017 20:03:51 +0000 (12:03 -0800)]
Update documentation for DIRTY in VoicemailContract

Change-Id: I1196e5043b1c30a14d7463bd0a5ba1db485c1f57
Fixes: 70639523
Test: N/A

6 years agoMerge "Add surface/shown position to proto output"
TreeHugger Robot [Fri, 15 Dec 2017 19:49:32 +0000 (19:49 +0000)]
Merge "Add surface/shown position to proto output"

6 years agoMerge "Add APIs for slice pinning"
Jason Monk [Fri, 15 Dec 2017 19:49:02 +0000 (19:49 +0000)]
Merge "Add APIs for slice pinning"

6 years agoFor loop condition fix
Erik Wolsheimer [Fri, 15 Dec 2017 19:31:33 +0000 (11:31 -0800)]
For loop condition fix

Change-Id: I5bddde2ea0bbbcfb4d16c91fc4ddc98a49040e10

6 years agoMerge "Publish Bluetooth HID Device Profile Service API"
Hansong Zhang [Fri, 15 Dec 2017 19:26:11 +0000 (19:26 +0000)]
Merge "Publish Bluetooth HID Device Profile Service API"

6 years agoTurn on connected device by default
jackqdyulei [Fri, 15 Dec 2017 18:59:15 +0000 (10:59 -0800)]
Turn on connected device by default

Bug: 69926683
Test: Build
Change-Id: Ia3389f459e7c9c6de3f549c60470bf12660d7a87

6 years agoMerge "Binding on-demand #6: Transport attributes usage"
Bernardo Rufino [Fri, 15 Dec 2017 18:58:06 +0000 (18:58 +0000)]
Merge "Binding on-demand #6: Transport attributes usage"

6 years agoMinimal reformat to match internal master.
Elliott Hughes [Fri, 15 Dec 2017 18:37:01 +0000 (10:37 -0800)]
Minimal reformat to match internal master.

Internal master SHA 1bcacfdcab0eaa0cee92bd7f5a1b5e271dd68e52 reformats
this entire project. To be able to update google-benchmark I need to
make a small change to this file. This is the minimal change that avoids
merge conflicts.

Bug: N/A
Test: builds
Change-Id: If3568a0f59a7c007858435953e127167f5862825

6 years agoMerge "Decrease frequency of jobs in middle buckets"
Esteban Talavera [Fri, 15 Dec 2017 18:34:22 +0000 (18:34 +0000)]
Merge "Decrease frequency of jobs in middle buckets"

6 years agoMerge "Adds MMTel APIs in temporary namespace" am: 4e54d6092b am: ac0d27659a
Brad Ebinger [Fri, 15 Dec 2017 18:20:32 +0000 (18:20 +0000)]
Merge "Adds MMTel APIs in temporary namespace" am: 4e54d6092b am: ac0d27659a
am: 0af882d629

Change-Id: I37c0ea61549282255f416855ec6663688e9d7cf3

6 years agoMerge "Adds MMTel APIs in temporary namespace" am: 4e54d6092b
Brad Ebinger [Fri, 15 Dec 2017 18:12:49 +0000 (18:12 +0000)]
Merge "Adds MMTel APIs in temporary namespace" am: 4e54d6092b
am: ac0d27659a

Change-Id: I815f2ea36c951f71c7b8feb85a42546eeea47000

6 years agoStatsd value metric anomaly detection
Bookatz [Fri, 15 Dec 2017 02:38:27 +0000 (18:38 -0800)]
Statsd value metric anomaly detection

Add anomly detection to Value metric in statsd.

Test: make statsd_test && adb sync data && adb shell data/nativetest64/statsd_test/statsd_test
Test: run cts-dev -m CtsStatsdHostTestCases -t android.cts.statsd.HostAtomTests#testValueAnomalyDetection
Fixes: 70240042
Change-Id: I05cf36495cdfd0ac7aa1a922f0e253a60fda1787

6 years agoMerge "Adds MMTel APIs in temporary namespace"
Brad Ebinger [Fri, 15 Dec 2017 18:05:43 +0000 (18:05 +0000)]
Merge "Adds MMTel APIs in temporary namespace"
am: 4e54d6092b

Change-Id: I95ad16f1e08ff11f9af8f626f6a8827308e806dd

6 years agoMerge "Adds MMTel APIs in temporary namespace"
Brad Ebinger [Fri, 15 Dec 2017 17:53:16 +0000 (17:53 +0000)]
Merge "Adds MMTel APIs in temporary namespace"

6 years agoMerge "Minor LoadedApk refactoring."
Jeff Hamilton [Fri, 15 Dec 2017 17:53:03 +0000 (17:53 +0000)]
Merge "Minor LoadedApk refactoring."

6 years agoAdd surface/shown position to proto output
Jorim Jaggi [Fri, 15 Dec 2017 17:44:43 +0000 (18:44 +0100)]
Add surface/shown position to proto output

Change-Id: I4fb16a520af182c8f77982646f6ac9ae82fd9173

6 years agoFix temporary file name strlcpy size.
Ivan Lozano [Fri, 15 Dec 2017 03:03:56 +0000 (19:03 -0800)]
Fix temporary file name strlcpy size.

The strlcpy size argument overflows on integer sanitized builds.

 runtime error: unsigned integer overflow: 11 - 35 cannot be represented
 in type 'unsigned long'

This doesn't cause a problem because strlcpy stops on the null in
TMP_FILE_PATTERN, and localTmpFileName is defined large enough to
contain TMP_FILE_PATTERN.

This changes the size argument to the remaining length in the buffer,
and removes an extraneous '/' write as TMP_FILE_PATTERN already begins
with '/'.

Bug: 30969751
Test: Reran CTS test which triggered the overflow.

Change-Id: I20b5deeaaa1a863324dfd1d94f3135920eae48d3

6 years agoUse iterator to remove elements from cache
Arthur Ishiguro [Fri, 15 Dec 2017 16:24:47 +0000 (08:24 -0800)]
Use iterator to remove elements from cache

Otherwise will throw ConcurrentModificationException when removing
entries.

Bug: 70715292
Test: Run CHQTS, verify pass. Also force remove an entry and verify no
exception is thrown.
Change-Id: Id702990ed0ddc1f2cc55dc0d450b9c6aac3d65ff

6 years agoMerge "Fix accessibility window position information."
Jorim Jaggi [Fri, 15 Dec 2017 16:56:51 +0000 (16:56 +0000)]
Merge "Fix accessibility window position information."

6 years agoDump services permissions on 'package' service.
Felipe Leme [Fri, 15 Dec 2017 01:16:39 +0000 (17:16 -0800)]
Dump services permissions on 'package' service.

Test: adb shell dumpsys package
Test: adb shell dumpsys package services-permissions
Test: adb shell dumpsys package android

Fixes: 70681510

Change-Id: I63be1df5276613193f5b079441d402a5382fdfde

6 years agoMerge "Export aidl files for framework" am: f5e37d18de am: 28064dd526
Colin Cross [Fri, 15 Dec 2017 16:42:07 +0000 (16:42 +0000)]
Merge "Export aidl files for framework" am: f5e37d18de am: 28064dd526
am: 79aee072bb

Change-Id: I1491878b8d009c0fe8e688c2397ea9380ff0335c

6 years agoMerge "Export aidl files for framework" am: f5e37d18de
Colin Cross [Fri, 15 Dec 2017 16:34:12 +0000 (16:34 +0000)]
Merge "Export aidl files for framework" am: f5e37d18de
am: 28064dd526

Change-Id: Iae7bdf79e68160c3ff7392cb0ff5c3f28996c910

6 years agoBinding on-demand #6: Transport attributes usage
Bernardo Rufino [Fri, 8 Dec 2017 19:55:03 +0000 (19:55 +0000)]
Binding on-demand #6: Transport attributes usage

Migrate the attribute queries from the Transport to the
TransportManager. Migrate all calls except currentDestinationString
because that's the one that changes and we should only migrate
after we have GMSCore that implements the push-from-transport
model.

Looking at method recordInitPendingLocked(), we only sent
MSG_RETRY_INIT if the transport threw while calling transportDirName
or the binder was null. With binding on-demand both of these cases
can't happen - i.e. we can't fail anymore. So, I removed the
message entirely.

Change-Id: I45a305704274c8b0c88637e3ccafc658639b2dfa
Ref: http://go/br-binding-on-demand
Bug: 17140907
Test: m -j RunFrameworksServicesRoboTests
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupTestCases
Test: gts-tradefed run commandAndExit gts-dev -m GtsBackupHostTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsBackupTestCases
Test: runtest -p com.android.server.backup frameworks-services
Test: adb shell bmgr backupnow <packages>
Test: adb shell bmgr fullbackup <packages>
Test: adb shell cmd jobscheduler run -f android <job_id>
Test: adb shell bmgr enable false (being enabled before)
Test: adb shell dumpsys backup
Test: adb shell bmgr init <transport>
Test: Observed logs and used debugger to check proper code was being
Test: called in above commands

6 years agoMerge "Track API changes in libcore" am: 63ae028ae0 am: 96211469a6
Neil Fuller [Fri, 15 Dec 2017 16:30:21 +0000 (16:30 +0000)]
Merge "Track API changes in libcore" am: 63ae028ae0 am: 96211469a6
am: 387817726e  -s ours

Change-Id: I25600a433c5f79aa340ea4dfc491eb6a790aea28

6 years agoMerge "Export aidl files for framework"
Colin Cross [Fri, 15 Dec 2017 16:26:19 +0000 (16:26 +0000)]
Merge "Export aidl files for framework"
am: f5e37d18de

Change-Id: If2e9391da213b064e1b55fa0da56e78ac144c89b

6 years agoMerge changes I5a26c853,Ie4ec660a
TreeHugger Robot [Fri, 15 Dec 2017 16:23:23 +0000 (16:23 +0000)]
Merge changes I5a26c853,Ie4ec660a

* changes:
  Implements disableNanoApp
  Implements enableNanoApp

6 years agoMerge "Track API changes in libcore" am: 63ae028ae0
Neil Fuller [Fri, 15 Dec 2017 16:22:14 +0000 (16:22 +0000)]
Merge "Track API changes in libcore" am: 63ae028ae0
am: 96211469a6

Change-Id: Ia6739db882bbc585ad7aa142795b59b4cba87fdb

6 years agoMerge "Export aidl files for framework"
Colin Cross [Fri, 15 Dec 2017 16:14:33 +0000 (16:14 +0000)]
Merge "Export aidl files for framework"

6 years agoMerge "Track API changes in libcore"
Neil Fuller [Fri, 15 Dec 2017 16:14:08 +0000 (16:14 +0000)]
Merge "Track API changes in libcore"
am: 63ae028ae0

Change-Id: I0163f365395c262b2a1402f674bdb7d0cc1b0e74

6 years agoMerge "Fix security bug: collect certs for non-systemDir apks."
TreeHugger Robot [Fri, 15 Dec 2017 16:12:51 +0000 (16:12 +0000)]
Merge "Fix security bug: collect certs for non-systemDir apks."

6 years agoMerge "Track API changes in libcore"
Neil Fuller [Fri, 15 Dec 2017 16:03:45 +0000 (16:03 +0000)]
Merge "Track API changes in libcore"

6 years agoMerge "Log an App Op when an accessibility action is performed."
Peter Visontay [Fri, 15 Dec 2017 15:58:12 +0000 (15:58 +0000)]
Merge "Log an App Op when an accessibility action is performed."

6 years agodocs: Added code tag to meta-data name and fixed some @see tags
Ricardo Loo Foronda [Fri, 27 Oct 2017 00:02:31 +0000 (17:02 -0700)]
docs: Added code tag to meta-data name and fixed some @see tags

Status: Ready for review.

Changes:
* Surrounded android.service.carrier.LONG_LIVED_BINDING with code tags
  in CarrierService class.
* Prefixed @see tags with # in CarrierConfigManager#KEY_FORCE_HOME_NETWORK_BOOL.
* Prefixed @see tag with class name in
  CarrierConfigManager#notifyConfigChangedForSubId.

Test: make ds-docs

Staged content:
*
https://android-dot-devsite.googleplex.com/reference/android/service/carrier/CarrierService.html
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#KEY_FORCE_HOME_NETWORK_BOOL
*
https://android-dot-devsite.googleplex.com/reference/android/telephony/CarrierConfigManager.html#notifyConfigChangedForSubId(int)

Bug: 23289716
Change-Id: I3b5be3ecc45bfb83e3fe0ae9bc76dc7761557e08

6 years agoMerge "Refactor scanPackagesDirtyLI()"
TreeHugger Robot [Fri, 15 Dec 2017 15:12:18 +0000 (15:12 +0000)]
Merge "Refactor scanPackagesDirtyLI()"

6 years agoMerge "Move Mutable{Int,Long} from libcore to framework." am: ba9db527ec am: cac71f08e4
Tobias Thierer [Fri, 15 Dec 2017 14:22:57 +0000 (14:22 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework." am: ba9db527ec am: cac71f08e4
am: 14886ae27b  -s ours

Change-Id: Ifd95001c08d746669ee77d05f6cf2a9665427f5c

6 years agoMerge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8 am...
Tobias Thierer [Fri, 15 Dec 2017 14:14:15 +0000 (14:14 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8 am: 0712266bd4
am: 6cade7fdd5  -s ours

Change-Id: Id4e5329ee78a816fd3212882ceb927c92da339fe

6 years agoMerge "Move Mutable{Int,Long} from libcore to framework." am: ba9db527ec
Tobias Thierer [Fri, 15 Dec 2017 14:12:41 +0000 (14:12 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework." am: ba9db527ec
am: cac71f08e4

Change-Id: Iea66238ac89df2f7b8e71f6df8dc7cadb2396d24

6 years agoMerge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8
Tobias Thierer [Fri, 15 Dec 2017 14:05:11 +0000 (14:05 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}." am: 833aa452a8
am: 0712266bd4

Change-Id: Idb94dd6559afb1cc72f3d84698306ee4e69c35dd

6 years agoMerge "Move Mutable{Int,Long} from libcore to framework."
Tobias Thierer [Fri, 15 Dec 2017 14:02:28 +0000 (14:02 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework."
am: ba9db527ec

Change-Id: I5c0ef040b00a9482cd3ae3500e4cdce2a9490072

6 years agoFix accessibility window position information.
Jorim Jaggi [Fri, 15 Dec 2017 13:56:19 +0000 (14:56 +0100)]
Fix accessibility window position information.

Since the position is now split up between WS and WSA, we need to
take both into account when calculating the window position.

Test: ViewTest, PermissionsHostTest, etc
Change-Id: I5d8396cee072316744cbb4a7e6585a820e808f60
Fixes: 70682698

6 years agoMerge "Track removal of android.system.Os.{sendfile,waitpid}."
Tobias Thierer [Fri, 15 Dec 2017 13:56:00 +0000 (13:56 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}."
am: 833aa452a8

Change-Id: Ieed0816cddba7d05bbebceae9ca6f5bc1f55bd08

6 years agoAdd hostdex target for android.test.base
Paul Duffin [Fri, 15 Dec 2017 13:52:59 +0000 (13:52 +0000)]
Add hostdex target for android.test.base

Bug: 30188076
Test: make dist
Change-Id: If9dc0f94df06fa3881b920e9f6688636a5addcf5

6 years agoMerge "Introduce DISALLOW_UNIFIED_PASSWORD."
Pavel Grafov [Fri, 15 Dec 2017 13:47:55 +0000 (13:47 +0000)]
Merge "Introduce DISALLOW_UNIFIED_PASSWORD."

6 years agoMerge "Move Mutable{Int,Long} from libcore to framework."
Tobias Thierer [Fri, 15 Dec 2017 13:46:52 +0000 (13:46 +0000)]
Merge "Move Mutable{Int,Long} from libcore to framework."

6 years agoMerge "Track removal of android.system.Os.{sendfile,waitpid}."
Tobias Thierer [Fri, 15 Dec 2017 13:45:12 +0000 (13:45 +0000)]
Merge "Track removal of android.system.Os.{sendfile,waitpid}."