1954 Commits

Author SHA1 Message Date
Paul Duffin
b6961ffa53 Merge "Replace core-junit with junit" am: 6ac5293751 am: a4d7100a3b
am: 9cb5f2815d

Change-Id: Ic5d35084e11387696997082f9c83ef25f543590b
2016-12-07 13:16:12 +00:00
Paul Duffin
9cb5f2815d Merge "Replace core-junit with junit" am: 6ac5293751
am: a4d7100a3b

Change-Id: If81ca0656d26e2b0e05913c491615f769cb63b55
2016-12-07 13:08:36 +00:00
Paul Duffin
6ac5293751 Merge "Replace core-junit with junit" 2016-12-07 12:52:03 +00:00
Damien Bargiacchi
53dd8b80a5 Centre clock text on visible characters instead of : character am: 45a7644004 am: 04f17be3e6
am: e2ca6b465e

Change-Id: If3edabead7835e9949f1d1601cbe7cb59c0bbc4c
2016-12-06 18:47:46 +00:00
Damien Bargiacchi
e2ca6b465e Centre clock text on visible characters instead of : character am: 45a7644004
am: 04f17be3e6

Change-Id: Ia6af0064f606062a646aa3e251b56631992aa86b
2016-12-06 18:40:39 +00:00
Damien Bargiacchi
04f17be3e6 Centre clock text on visible characters instead of : character
am: 45a7644004

Change-Id: Ibb152f2217297ab0b0aa1ec622e59ae8ae815d59
2016-12-06 18:32:48 +00:00
Paul Duffin
9249205d1b Replace core-junit with junit
Bug: 30188076
Test: make checkbuild
Change-Id: I0cb6f89907eb099714b54bac57b51c4be186c3e0
2016-12-06 14:32:41 +00:00
Damien Bargiacchi
45a7644004 Centre clock text on visible characters instead of : character
Bug: 33340845
Change-Id: I235ad7c6aafc62daa55242f81df2d076f27c56df
2016-12-05 18:02:18 -08:00
Svetoslav Ganov
82737b42a6 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-12-05 13:52:05 +00:00
Jeff Sharkey
3f39991889 Merge "Add 'fstrim' command for use from shell." 2016-12-01 22:03:08 +00:00
Andreas Gampe
6e2047ad27 Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd am: 0662cd5de8 am: 1c82020e2a
am: 779f824a1b

Change-Id: I31c222f36404597eb66ddd8879285a34c3f3ce4b
2016-12-01 03:14:38 +00:00
Andreas Gampe
779f824a1b Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd am: 0662cd5de8
am: 1c82020e2a

Change-Id: I8c93bcf457c7bf7af78d13667922f908af7cb3d1
2016-12-01 03:09:52 +00:00
Andreas Gampe
1c82020e2a Merge "App_process: Merge app_process and app_process__asan" am: de32925ccd
am: 0662cd5de8

Change-Id: I6df03a4573610d600a037b52635414bc600772e0
2016-12-01 02:59:01 +00:00
Andreas Gampe
0662cd5de8 Merge "App_process: Merge app_process and app_process__asan"
am: de32925ccd

Change-Id: I86aaea459fdc1283a3b7e2f0b035ad26aef98920
2016-12-01 02:48:18 +00:00
Andreas Gampe
0f9d3f29b7 Merge "App_process: Clean up sanitized binaries" am: 273adb5257 am: c07a430722 am: 85b63db42a
am: 8c6429cb3e

Change-Id: Ib5259990d5ad5fa9da961d4b9a4d66e7b827fe97
2016-12-01 00:36:37 +00:00
Andreas Gampe
2200e09736 App_process: Merge app_process and app_process__asan
Two birds with one stone: simplify the setup (including the modules
required in PRODUCT_PACKAGES) and work around a build system issue
wrt/ sanitized static libraries.

Bug: 33224213
Test: mmma frameworks/base/cmds/app_process && \
      mmma SANITIZE_TARGET=address SANITIZE_LITE=true \
      frameworks/base/cmds/app_process && \
      ls $OUT/system/bin/asanwrapper && \
      readelf -s $OUT/system/bin/app_process32 | grep asan && \
      readelf -s $OUT/system/bin/asan/app_process32 | grep asan && \

Change-Id: Ieff0ea9a2209cf74cf06f813087b55cb0bcc3896
2016-11-30 16:35:32 -08:00
Andreas Gampe
8c6429cb3e Merge "App_process: Clean up sanitized binaries" am: 273adb5257 am: c07a430722
am: 85b63db42a

Change-Id: I083cc7d1a906c5b2996d382e465be745b724b1f9
2016-12-01 00:28:19 +00:00
Glenn Kasten
039d7cc30d Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f am: 25889e4d6c
am: c408777f36

Change-Id: I150ff727e35ddac8dc2a8401a3cd5e2d4a04bd2d
2016-12-01 00:21:48 +00:00
Andreas Gampe
85b63db42a Merge "App_process: Clean up sanitized binaries" am: 273adb5257
am: c07a430722

Change-Id: Ib507ba1a1abd185ed6977722f9c1cb42cf84eab0
2016-12-01 00:20:05 +00:00
Glenn Kasten
c408777f36 Merge "LOCAL_CLANG := true is now the default" am: 1204e3806f
am: 25889e4d6c

Change-Id: I556e40803c942626dceafc7e12278d75ef33337f
2016-12-01 00:17:36 +00:00
Andreas Gampe
c07a430722 Merge "App_process: Clean up sanitized binaries"
am: 273adb5257

Change-Id: I83ec3dd0ad23844cc9ba3420bc43b9b8deb3d1ca
2016-12-01 00:09:00 +00:00
Glenn Kasten
25889e4d6c Merge "LOCAL_CLANG := true is now the default"
am: 1204e3806f

Change-Id: Id579bdea109bca2056cea6c0359e18b120801bf4
2016-12-01 00:06:49 +00:00
Andreas Gampe
622f511f2f App_process: Clean up sanitized binaries
Clean up the definition of sanitized binaries. Clean up the
Android.mk to share values.

Bug: 33224213
Test: mmma SANITIZE_TARGET=address SANITIZE_LITE=true frameworks/base/cmds/app_process && ls $OUT/system/bin/asan
Change-Id: I70f8d95ff2ec6366fc0a7d252b91dce268186910
2016-11-30 09:46:09 -08:00
Glenn Kasten
827d0d76fb LOCAL_CLANG := true is now the default
Change-Id: I2f6a8c7f32cbf682c968a43d590d773ffb21e909
(cherry picked from commit 3a7510bcf6089d3ef768de7cf805ca783f0aac17)
2016-11-30 09:42:23 -08:00
Jorim Jaggi
241ae10b21 Add explicit method to dismiss Keyguard
The flag is a bit clunky for most cases, and a method is more
clear.

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardTests

Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test
android.server.cts.KeyguardLockedTests

Test: runtest systemui -c
com.android.systemui.keyguard.DismissCallbackRegistryTest

Bug: 30961403
Bug: 27422134
Change-Id: I39de90c7cfecd99350a74f72cd76418e337f2b79
2016-11-23 16:27:35 +01:00
Baligh Uddin
b1df48d326 Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug: 32849428

* goog/cw-f-dev: (98 commits)
  Revert "Catch KeyStoreException for setting profile lock"
  Fix createConfirmDeviceCredentialIntent for wear for CTS.
  Fix default dialog background colour for watch devices.
  Catch KeyStoreException for setting profile lock
  Add cross-links between FINE and COARSE location permissions. bug: 25371600
  Fixed a bug with the emergency affordance in multi user
  Zygote: Additional whitelists for runtime overlay / other static resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  colors: add missing accent_material_{700,50} resources.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Zygote : Block SIGCHLD during fork.
  DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
  ...

Change-Id: I63468da5bfa21ed9ac5985bbdbf3a61d4c389aa0
2016-11-22 17:19:45 -08:00
Jeff Sharkey
31d0b7043d Add 'fstrim' command for use from shell.
Test: builds, boots, new command works
Bug: 20948199
Change-Id: If7b122a6c98a4ce2a2f38e545015a22decd1b516
2016-11-21 15:05:09 -07:00
Jerry Zhang
54f33d9af2 Refactored setCurrentFunction and setUsbDataUnlocked into single method. am: 935372bfd6 am: 5cbd151d40
am: fb4a03c8f8

Change-Id: Ibdcd5074ceb48457227319f0869c6cbc62045954
2016-11-17 00:39:07 +00:00
Jerry Zhang
5cbd151d40 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
am: 935372bfd6

Change-Id: I5436278e092f691c9179f7cc3709c4578b544e74
2016-11-17 00:12:50 +00:00
Jerry Zhang
b37d826204 Merge changes from topic 'usb_bugfixes-mirror-aosp-master'
* changes:
  Refactored setCurrentFunction and setUsbDataUnlocked into single method.
  Clean up persistent usb state on boot.
  Fixed handling of usb state during adb changes.
2016-11-16 23:59:33 +00:00
Jerry Zhang
935372bfd6 Refactored setCurrentFunction and setUsbDataUnlocked into single method.
This gets rid of an extraneous configuration change when going from
adb to adb + file transfer as previously the config would have been
reset once for functions and once for data unlocked.

It also simplifies some of the code.

Test: manually changing usb configurations
Change-Id: Ica10a195338b2189db13113f44657393db110bee
(cherry picked from commit 7a396be6d5ba8914933a54b5bfac25e118db0e9f)
2016-11-15 15:29:45 -08:00
Sudheer Shanka
2250d56a0b Rename MountService to StorageManagerService.
Bug: 30977067
Test: Existing tests pass
Change-Id: Ieac0f11c2b249dcd60441b14c1f391e6f8131d42
2016-11-15 12:43:37 -08:00
Svetoslav Ganov
afb49d395e Add WiFi toggle prompts - framework am: 6c3032f16b
am: 23328d9714

Change-Id: I629311080b90402a3919dcd3c7b49291800a398b
2016-11-15 03:40:16 +00:00
Svetoslav Ganov
6c3032f16b Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

bug:28715749

Original-Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Change-Id: I3fdc2b02abecaf3166614b0cb9fac3553cb7ab88
(cherry picked from commit d3663c04a721e0848dd3e9179c84ba585d91839d)
2016-11-14 18:34:40 -08:00
Sudheer Shanka
dc589ac82b Update usage of ActivityManagerNative.
- Remove references to ActivityManagerProxy.
- Add isSystemReady to ActivityManager.

Bug: 30977067
Test: cts/hostsidetests/services/activityandwindowmanager/util/run-test android.server.cts
      adb shell am instrument -e class com.android.server.am.ActivityManagerTest,com.android.server.am.TaskStackChangedListenerTest \
          -w com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I07390b6124fb1515821f5c0b37baf6ae74adc8fa
2016-11-14 11:27:12 -08:00
Svetoslav Ganov
0efa843e72 Add WiFi toggle prompts - framework
If permission review is enabled toggling WiFi on or off
results in a user prompt to collect a consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.

Bug: 28715749
Test: Unit Tests

Change-Id: I020601e208c0736005bcabc7b7b77b96eee45b03
Merged-In: I020601e208c0736005bcabc7b7b77b96eee45b03
2016-11-14 10:26:52 -08:00
Jorim Jaggi
2fef6f7b15 Add ability to modify credential via shell command
Test: adb shell locksettings set-pattern 1234
Test: adb shell locksettings set-pin --old 1234 1234
Test: adb shell locksettings set-password --old 1234 1234
Test: adb shell locksettings clear --old 1234
Test: runtest frameworks-services -c
com.android.server.LockSettingsShellCommandTest

Change-Id: I8f541effc7eab0d7453cd9a9b46c280a6425e258
2016-11-08 15:52:15 -08:00
Sudheer Shanka
fc46e9b643 Move IActivityManager to aidl.
Bug: 30977067
Test: Existing tests are passing, dump commands still working.
Change-Id: I9cf81c4d381ebce14a6c701e409cbb269f2ff1fb
2016-11-04 10:43:25 -07:00
Dianne Hackborn
a59ddd7961 Merge "Switch settings command to use "cmd" call on service." 2016-11-04 00:15:26 +00:00
Michael Kwan
ef945b6706 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
2016-11-03 19:18:21 +00:00
Michael Kwan
040b4826c2 DO NOT MERGE ANYWHERE Add supports-multiwindow command to am.
The supports-multiwindow command allows the ability to
check if the device has multiwindow support in the shell.

Bug: 30120559
Change-Id: I466e28d8a794fa457826a6526ef9ef660cd3856c
2016-11-03 19:00:00 +00:00
Dianne Hackborn
1d44c243a8 Switch settings command to use "cmd" call on service.
Test: manual

Change-Id: I369fd144d830529009f2859fa5c666973092bc09
2016-11-02 13:11:15 -07:00
Ben Wagner
18bd88534a Replace SkAutoTUnref with sk_sp.
Skia would like to remove SkAutoTUnref and replace it with sk_sp.
This also removes the last SkAutoTDelete straggler.

Change-Id: Idd46fcbbffe7fc1edb243b82b1c2f5425ccd60b6
2016-11-02 16:30:50 +00:00
Dianne Hackborn
2882406de3 Switch am command to go through "cmd activity".
For almost everything...  except instrument, which still needs
to be run as the shell user so its UiAutomator callbacks
will work correctly (and not create security holes).

Test: manual

Change-Id: I2e62714a2d5b52501aa261b7e4d6b282b54a0027
2016-11-01 11:00:41 -07:00
Damien Bargiacchi
f5970785ad Allow boot clock to be toggled between 12 and 24 hour format am: 9071db1d37 am: 3400dffcad
am: bb2e8993f0

Change-Id: I8f4ccc9e82e5539c615a8388a002d5ab196f77f9
2016-11-01 01:56:55 +00:00
Damien Bargiacchi
bb2e8993f0 Allow boot clock to be toggled between 12 and 24 hour format am: 9071db1d37
am: 3400dffcad

Change-Id: Ic4df64d163845547416ef1280ae2ba2f1b41efda
2016-11-01 01:52:09 +00:00
Damien Bargiacchi
3400dffcad Allow boot clock to be toggled between 12 and 24 hour format
am: 9071db1d37

Change-Id: Ief7d44034df3a59adc2f65ba79154a1ee933040c
2016-11-01 01:46:37 +00:00
TreeHugger Robot
71a865d22d Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev 2016-11-01 01:40:01 +00:00
Damien Bargiacchi
9071db1d37 Allow boot clock to be toggled between 12 and 24 hour format
Bug: 32461548
Change-Id: I414192e6d9f3ae44267f4a360e35647f18c420b4
2016-10-28 18:04:48 -07:00
Igor Murashkin
12ffdd86e4 Merge "app_process: Forward -cp/-classpath to ART." am: 4a4a8f1555 am: d0d99d8a3d am: 4aa38633fe
am: 7ab062fd66

Change-Id: I6d093ad8aa1b04d75e6968ebcb9c0fb7376f0811
2016-10-28 18:05:46 +00:00