Commit Graph

309172 Commits

Author SHA1 Message Date
TreeHugger Robot
a92c180107 Merge "Also parse "1" as true for ContentValues#getAsBoolean" 2017-01-25 20:19:11 +00:00
George Burgess IV
858852a6dc Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206 am: f77f2cb3e7
am: 0c6283e396

Change-Id: Ife5d9444f9036c16540bd7bf7a1c0e17cf296df5
2017-01-25 20:19:05 +00:00
George Burgess IV
0c6283e396 Merge "Fix a use-of-uninitialized-value warning." am: 500cf67206
am: f77f2cb3e7

Change-Id: I44e23c5689b51ae002a8db71a537ab97d3f31121
2017-01-25 20:14:00 +00:00
Android Build Merger (Role)
73c945de33 Merge "Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0 am: deac669a53" 2017-01-25 20:13:03 +00:00
TreeHugger Robot
260dedceda Merge "[clipboard] Clipboard sharing" 2017-01-25 20:12:17 +00:00
Ruchi Kandoi
2a13fbae73 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614 am: 40c14a83d0
am: deac669a53

Change-Id: I208e9c5d6fbbfa9f3a6c0d43f38fcacc040ccb92
2017-01-25 20:12:06 +00:00
George Burgess IV
f77f2cb3e7 Merge "Fix a use-of-uninitialized-value warning."
am: 500cf67206

Change-Id: I8b171a90696e09c42a1506255bc4c0056f69f35c
2017-01-25 20:09:26 +00:00
Ruchi Kandoi
deac669a53 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed am: e6cb2aa614
am: 40c14a83d0

Change-Id: I7ef55eddac20d58e9184056e85c9b49e733fd38d
2017-01-25 20:07:23 +00:00
Josh Gao
59972218f8 zygote: don't drop CAP_SYS_PTRACE from the bounding set.
crash_dump needs to acquire CAP_SYS_PTRACE to be able to ptrace
processes with capabilities. selinux should hopefully be sufficient for
restricting ptrace to processes that should do it.

Bug: http://b/34694637
Test: debuggerd `pidof system_server`
Change-Id: If46f0b9baa54529780f7767f309f76b102a42ab4
2017-01-25 12:03:02 -08:00
Ruchi Kandoi
40c14a83d0 Merge "nfc: Make NDEF validation stricter" am: f3a6269fed
am: e6cb2aa614

Change-Id: Ib069a18f16850d419b6c10c3b80e80115d9d8fc8
2017-01-25 20:03:00 +00:00
Treehugger Robot
500cf67206 Merge "Fix a use-of-uninitialized-value warning." 2017-01-25 20:01:34 +00:00
Ruchi Kandoi
e6cb2aa614 Merge "nfc: Make NDEF validation stricter"
am: f3a6269fed

Change-Id: If69e586c81e5926c0795af3689de67b260891eaa
2017-01-25 19:59:16 +00:00
Rubin Xu
1b60614ae9 Merge "Fix build breakage" 2017-01-25 19:56:40 +00:00
Adrian Roos
7b9ed0d8fd DirectReply: Show historic messages
Test: Post notification with MessagingStyle.addHistoricMessage(), verify they show up while direct replying.
Change-Id: I26b801d05305a5251fe0d6fae1fe1c24064105a9
2017-01-25 11:56:32 -08:00
Amith Yamasani
801e342faa Don't return self if not a profile
This fixes the inconsistency between no profile and a
removed profile.

Change-Id: I85d37ce42113bde8567be382372c5f4997601e85
Fixes: 34699518
Test: runtest -x
frameworks/base/services/tests/servicetests/src/com/android/server/pm/UserManagerTest.java
2017-01-25 11:55:51 -08:00
Jason Monk
d5e96800d2 Merge "Fix up the tests (yet again)" 2017-01-25 19:55:37 +00:00
Wei Jia
23dfee521a mediaplayer: add buffering settings API
Test: compiles, ensured that params is passed all the way to source
Bug:32524218

Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf
2017-01-25 11:54:56 -08:00
Treehugger Robot
f3a6269fed Merge "nfc: Make NDEF validation stricter" 2017-01-25 19:54:01 +00:00
Selim Cinek
6825542381 Merge "Started visual hierarchy for min priority notifications" 2017-01-25 19:53:49 +00:00
TreeHugger Robot
000f7cd646 Merge "Initial IME integration." 2017-01-25 19:44:33 +00:00
TreeHugger Robot
13fd7f1899 Merge "Fix issue with PiP hiding when dragging divider." 2017-01-25 19:31:56 +00:00
TreeHugger Robot
79e5cf1cc7 Merge "Fixing issue with wrong bounds being reported in StackInfo." 2017-01-25 19:29:00 +00:00
Vladislav Kaznacheev
4db5dedb76 Revert "Revert "Remove View.setTooltip/getTooltip""
This reverts commit c56c7462ef.

Change-Id: Id129d099e3579b2c51d77c1fee25816ba3bd9df7
2017-01-25 19:24:15 +00:00
TreeHugger Robot
142cbdd474 Merge "Expose intents for launching channel settings." 2017-01-25 19:20:21 +00:00
Robin Lee
588a333741 Launch work lock scrim as clear_top not single_top
SINGLE_TOP is only guaranteed to work within the current task stack.
If multiple stacks are inactive in the background (eg. temporarily
switching from freeform mode to fullscreen mode by maximising one
activity) some tasks might get missed out and stay visible.

Test: manual -- start two work activities, one in fullscreen & one in freeform. start a personal
Test: activity in freeform too. switch to the fullscreen work app and lock the profile using
Test: `adb shell service call trust 6 i32 $USER_ID i32 1`
Test: __outcome after change__
Test:   a) locking work profile should bring up the work password prompt in fullscreen
Test:   b) skipping the prompt and switching to the personal freeform app should keep the freeform
Test:      work app hidden by WorkLockActivity
Test: __outcome before change__
Test:   Only (a) happened, for step (b) the work app was still visible
Bug: 31001762
Change-Id: I5979c5b12670a21c7bcd59e222fc518d395e3e29
2017-01-25 19:19:34 +00:00
Robin Lee
5d59242c2e Animate starting work challenge from work lock
Bug: 31001762
Test: adb shell service call trust 6 i32 10 i32 1 && adb shell am start -a com.android.systemui.recents.TOGGLE_RECENTS
Change-Id: Ic6c622c32718bd235eb71704881b853072383dba
2017-01-25 19:19:33 +00:00
TreeHugger Robot
fbcb01cde7 Merge "Move theme out of tuner and into display settings" 2017-01-25 19:17:22 +00:00
Rubin Xu
06c39bc07f Fix build breakage
Implement new methods in MockStorageManager

Test: it builds
Change-Id: Icdd49a1b6709ab63a8b00328b9da8120482bbc8a
2017-01-25 19:13:27 +00:00
Evan Rosky
df7f283520 Merge "Changed cluster kb navigation shortcut to meta+[shift]+tab" 2017-01-25 19:04:22 +00:00
Robert Sesek
037e758db5 Merge changes I100dac6b,Ibbecac7e
* changes:
  Enable multiprocess WebView by default.
  Prepare to enable multiprocess by default.
2017-01-25 19:00:44 +00:00
Soonil Nagarkar
2f1f7e8d68 Add background location throttling whitelist support.
Test: manually

Change-Id: I6754fbb8f5eaf7bec3e469a9f25ac4a77965ea50
2017-01-25 11:00:05 -08:00
Lenka Trochtova
c6f0e23fa0 Don't offer the BT sharing option to the user if BT is disallowed.
Disable BluetoothOppLauncherActivity component if the
UserManager#BLUETOOTH_DISALLOWED user restriction is set.

Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTest#testBluetoothRestriction

Bug: 32895060
Bug: 34239380

Change-Id: I3467c82881896f276f542583bb50807b5e27276b
2017-01-25 18:55:33 +00:00
Hakan Seyalioglu
96ba588a82 Mark two test methods public so they can be mocked
Without this, the mocked version looks like it's calling
the default implementation (which immediately fails due to
a bunch of null fields) - with this it just returns null.

I would ultimately like to stop mocking out the controller
and instead use a mocked package manager (which there is
already some set up to do). But in the meanwhile, this at least
gets the test passing.

Test: Checked the test passes.

Change-Id: I92d1f2796cfce21bf55e927bd56690c582f41e91
2017-01-25 10:51:53 -08:00
Salvador Martinez
2613bf2cef Moved LinkTextView to settingslib
This View is being used by several projects and so
I moved it to settingslib so there are not multiple
copies floating around.

Test: Manual & robotests for projects that use it
Bug: 34621372
Change-Id: I8d51a1b5383fad977754eeeb78dce545e506be04
2017-01-25 10:49:11 -08:00
TreeHugger Robot
b93ecbae57 Merge "MessagingStyle: Add historic messages" 2017-01-25 18:47:20 +00:00
Rubin Xu
e7beedff6e Merge "Add unit tests for LockSettingsService" 2017-01-25 18:38:31 +00:00
Christine Franks
b3e3100489 Merge "Merge "Require password to FR in carrier demo mode"" 2017-01-25 18:38:03 +00:00
Andre Eisenbach
b9059986d7 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0 am: 8b1d096e58
am: c39388d605

Change-Id: I51a9cec90c232b6f16e50f9a962bf2795bbf725b
2017-01-25 18:28:55 +00:00
Andre Eisenbach
c39388d605 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f am: 36ce9b7ea0
am: 8b1d096e58

Change-Id: I4fd28828d5ed8ec2a3e93b6f8ab074dccdcb30e2
2017-01-25 18:23:50 +00:00
Ruchi Kandoi
2ed0b48abb nfc: Make NDEF validation stricter
- Check if the MB is not set for any record apart from the first one.
- If the record is chunked, first record must contain the type

Bug: 20722275
Test: Manual; write raw NDEF messages to a tag
Change-Id: I3e73fc5163bbcd8a1f23417e98f57b665f4f1fad
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2017-01-25 18:21:28 +00:00
Peter Qiu
ddf6fa06c6 hotspot2: added remaining parameters to PasspointConfiguration
Added remaining parameters to PasspointConfiguration to support complete
PerProviderSubscription tree for Release 2 support.

The new parameters include:
- Update identifier
- Credential priority
- AAA server trust root
- Subscription update
- Subscription parameters

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: If50253612f7777b3b693a344378a2e4810b3ff47
2017-01-25 10:20:22 -08:00
Andre Eisenbach
8b1d096e58 Merge "Bluetooth: fix indentation, formatting in dumpsys" am: 35c715332f
am: 36ce9b7ea0

Change-Id: I3381764156fadf755d679b9a3c9356fc90e50fd2
2017-01-25 18:19:51 +00:00
Andre Eisenbach
36ce9b7ea0 Merge "Bluetooth: fix indentation, formatting in dumpsys"
am: 35c715332f

Change-Id: I7c603ab9f50921afb45e3d7181541260d8939089
2017-01-25 18:16:27 +00:00
Grigory Dzhavadyan
63408e643a [clipboard] Clipboard sharing
The fix has been submitted to the emulator: https://android-review.googlesource.com/#/c/298922/

Resolved merge conflict with 1611052.

Change-Id: Ic1e9a3d2dfc3c933d83482d92bfb4da1fee4ebbe
2017-01-25 10:16:06 -08:00
Peter Qiu
2d7af45e93 hotspot2: add support for complete PerProviderSubscription/Policy subtree
Added Policy to PasspointConfiguration and the corresponding parser
support in PPSMOParser.

While there, fix a typo in node name "CertSHA256Fingerprint" under
CertificateCredential.

Bug: 34198926
Test: frameworks/base/wifi/test/runtests.sh
Change-Id: Iabe27cd83b6658ed7d4f895d7fe2255fe2094ebb
2017-01-25 10:14:37 -08:00
Hangyu Kuang
6ab568b4ba Merge "media: Relax the filedescriptor check to allow write-only mode." 2017-01-25 18:07:26 +00:00
Hongming Jin
ea694adb68 Merge "Test: AccountManagerService APCT test." 2017-01-25 18:06:31 +00:00
Andre Eisenbach
35c715332f Merge "Bluetooth: fix indentation, formatting in dumpsys" 2017-01-25 18:05:11 +00:00
Marie Janssen
a95924da57 Bluetooth: fix indentation, formatting in dumpsys
Before
======
Enable log:
01-17 09:43:18   Enabled  by com.android.systemui
01-18 07:13:10  Disabled  by com.andorid.systemui

1 BLE Apps registered:
com.google.android.gms

After
=====
Enable log:
  02-06 07:49:07   Enabled  by system boot
  02-06 07:49:35  Disabled  by com.andorid.systemui

1 BLE App registered:
  com.google.android.gms

Test: run bugreport, see differences in dumpsys
Change-Id: I6086f7f97c1fcbdb860d70d9516fd5bf630a9f5e
2017-01-25 18:02:26 +00:00
Edman Anjos
452efaac32 Merge changes I50d2903e,Ieb347ce3
* changes:
  Add DPMS delegation scopes.
  Add block uninstall delegation in DPMS.
2017-01-25 18:00:03 +00:00