Commit Graph

56509 Commits

Author SHA1 Message Date
Jesse Hall
9a38ba89e5 Merge "Refer to hasSystemFeature(String, int) in Vulkan feature docs" into nyc-dev
am: a3fc34c71d

* commit 'a3fc34c71dd57ae3b7ac4972453ce7fab0dc62bb':
  Refer to hasSystemFeature(String, int) in Vulkan feature docs
2016-03-10 17:23:15 +00:00
Jesse Hall
39ceeb5472 Refer to hasSystemFeature(String, int) in Vulkan feature docs
Bug: 27531286
Change-Id: Ifb32ae519fc8118923d6216e1d574cbbf83dfd23
2016-03-10 09:04:26 -08:00
Daniel Micay
b562aaaa4c Merge "fix SeekBarPreference support for summaries"
am: 06ce16a54c

* commit '06ce16a54c971e922d9e34cc5a57f012614db20f':
  fix SeekBarPreference support for summaries
2016-03-10 15:33:51 +00:00
Daniel Micay
084ee67b35 fix SeekBarPreference support for summaries
Overriding getSummary breaks support for summaries even though it's
supported in the layout for SeekBarPreference. If there's no summary the
return value is already null in the inherited implementation.

Change-Id: I2e72ea3c4a624acbf200e9617173eb072572fa57
2016-03-09 21:50:30 -05:00
Hyunyoung Song
c742752735 Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev
am: ef33726e14

* commit 'ef33726e1439adeb408b0ca44f0ee55042dad26d':
  Revert "Apply transformations while offsetting focused rects"
2016-03-10 02:28:28 +00:00
Hyunyoung Song
4eb1a4e003 Revert "Apply transformations while offsetting focused rects"
b/27335262

This reverts commit 83e725da7a.

Change-Id: I55079bbaab81610e9de3a8d68ed21cf352da5983
2016-03-10 02:19:14 +00:00
Dianne Hackborn
1f786e4bcd Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev
am: 839ff816a5

* commit '839ff816a516a6eb806aee2cef681ad3b3c14b56':
  DO NOT MERGE: Add separate information about user whitelist.
2016-03-10 01:53:05 +00:00
Dianne Hackborn
839ff816a5 Merge "DO NOT MERGE: Add separate information about user whitelist." into nyc-dev 2016-03-10 01:46:03 +00:00
Dianne Hackborn
262ae5c8eb DO NOT MERGE: Add separate information about user whitelist.
Use this in the alarm manager to allow user whitelisted apps
to have free access to scheduling alarms.

Coming next: lifting sync/job restrictions.

Bug #26851107: Allow user whitelist apps more freedom

(Cherry-picked to nyc since it got lost in the branch from master.)

Change-Id: I4dc9f07514627ebdb6b6eff7c7a749f2c51a3797
2016-03-09 17:39:40 -08:00
Joe Onorato
af2d5fb699 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
am: 04a72a2a51

* commit '04a72a2a51ce3d128959b2ba53b5c22576322e59':
  Add an API for apps to get their System Health / Battery Stats data.
2016-03-10 00:58:30 +00:00
Joe Onorato
04a72a2a51 Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev 2016-03-10 00:52:03 +00:00
Yin-Chia Yeh
1f85a37630 Merge "Camera: codegen update" into nyc-dev
am: 0ae49cc667

* commit '0ae49cc667c20a30ba800bfb03c4caf872169d93':
  Camera: codegen update
2016-03-10 00:32:05 +00:00
Yin-Chia Yeh
0ae49cc667 Merge "Camera: codegen update" into nyc-dev 2016-03-10 00:24:56 +00:00
Makoto Onuki
837a5fd72d Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev
am: 495d124a67

* commit '495d124a67daa1f070ca0ca0be0c14377675200a':
  ShortcutManaegr: load config from settings, also...
2016-03-10 00:22:17 +00:00
Makoto Onuki
495d124a67 Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev 2016-03-10 00:18:36 +00:00
Jeff Sharkey
ffc1208daf Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev
am: 6b432fa255

* commit '6b432fa255db0a24388a0698cfe3e01190a4f2ce':
  Restrict TrafficStats due to privacy concerns.
2016-03-10 00:06:49 +00:00
Jeff Sharkey
6b432fa255 Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev 2016-03-09 23:59:21 +00:00
Vadim Tryshev
ed633e97e3 Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
am: 4eeb7e2cae

* commit '4eeb7e2cae3d7cae43a35a6cc43b03ab923937bd':
  Fixing bugs with peeking a wallpaper.
2016-03-09 23:50:35 +00:00
Todd Kennedy
33e6d759cb Merge "remove splits" into nyc-dev
am: f96eee36df

* commit 'f96eee36df0cc987bafd1f01ce69504191efb8b8':
  remove splits
2016-03-09 23:50:34 +00:00
Jeff Sharkey
0d69d3dfe1 Restrict TrafficStats due to privacy concerns.
Granular per-UID network statistics can be used to infer user
behavior over time, so they fall under the umbrella of the
PACKAGE_USAGE_STATS permission.

Since we can't check app-ops based permissions in the kernel, the
best we can do is redirect users to the NetworkStatsManager class,
which offers a much more robust historical data set.

Bug: 27577101
Change-Id: I696bdc5e0b3d7e24acf35f388d0ab13617ed8af3
2016-03-09 16:49:45 -07:00
Joe Onorato
713fec85b8 Add an API for apps to get their System Health / Battery Stats data.
Change-Id: Ib27e1be469b826f6d83d73ce6024102bbdb1d47a
2016-03-09 15:47:24 -08:00
Vadim Tryshev
4eeb7e2cae Merge "Fixing bugs with peeking a wallpaper." into nyc-dev 2016-03-09 23:44:23 +00:00
Todd Kennedy
f96eee36df Merge "remove splits" into nyc-dev 2016-03-09 23:43:21 +00:00
Jeff Sharkey
7051cad205 Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
am: 93720d5729

* commit '93720d572971115b4968acc8f64529b5698bfd11':
  Log when pre-N apps send too much to DropBox.
2016-03-09 23:37:21 +00:00
Todd Kennedy
eb9b05392a remove splits
Individual splits can now be removed for an application. The
application will be terminated if it's running when a split is
removed.

To remove a split, either use either "uninstall":
    $ adb shell cmd package uninstall <PACKAGE> <SPLIT>

or "install-remove":
    $ adb shell cmd package install-create -r -p <PACKAGE>
    $ adb shell cmd package install-remove <SESSION> <SPLIT>
    $ adb shell cmd package install-commit <SESSION>

For "install-remove" you must use '-r' and '-p' when creating
the session.

Bug: 27547051
Change-Id: I4d71a19ad45e39f6622d9ab6791ea8c4230a79e0
2016-03-09 15:34:00 -08:00
Jeff Sharkey
93720d5729 Merge "Log when pre-N apps send too much to DropBox." into nyc-dev 2016-03-09 23:31:01 +00:00
Jeff Sharkey
b8e8a91f54 Log when pre-N apps send too much to DropBox.
Once they target N, they'll start getting exceptions, which is
intended to make sure they pay attention to data that would have
otherwise been dropped on the floor.

Bug: 27571535
Change-Id: I49163679c629cd0788327d2c3a654e757ecdcb99
2016-03-09 16:27:42 -07:00
Makoto Onuki
4362a66dba ShortcutManaegr: load config from settings, also...
support "cmd override-config" and "cmd reset-config" to help CTS.

Bug 27548047

Change-Id: Id6c9e6f41a2238856dd3470d88d88d0e7e686f26
2016-03-09 15:17:29 -08:00
Yin-Chia Yeh
373482009b Camera: codegen update
Add device custom scene mode range.

Bug: 26687007
Change-Id: I4a11e5f0bc5cbaabe85d4f9c6f2904125a038028
2016-03-09 15:01:06 -08:00
Makoto Onuki
027fd0ae95 Merge "ShortcutManager: add remaining APIs." into nyc-dev
am: 4a07c34ca8

* commit '4a07c34ca86fddb75332eba22a4d7b9bd48205db':
  ShortcutManager: add remaining APIs.
2016-03-09 22:33:35 +00:00
Makoto Onuki
4a07c34ca8 Merge "ShortcutManager: add remaining APIs." into nyc-dev 2016-03-09 22:28:45 +00:00
Suprabh Shukla
06a3c6d32c Merge "Calling method in DPMS after resolving userId" into nyc-dev
am: d7924b6063

* commit 'd7924b60635d62f2df888b53dc3ef27d9947133c':
  Calling method in DPMS after resolving userId
2016-03-09 21:58:10 +00:00
Suprabh Shukla
d7924b6063 Merge "Calling method in DPMS after resolving userId" into nyc-dev 2016-03-09 21:50:44 +00:00
Kirill Grouchnikov
44f19eebb2 Merge "Tweaks to ViewOverlay." into nyc-dev
am: 04c659299f

* commit '04c659299f3ef9ca82a40e068695473add350ea4':
  Tweaks to ViewOverlay.
2016-03-09 21:40:38 +00:00
Suprabh Shukla
8bea73e5c1 Calling method in DPMS after resolving userId
ActivityManagerService was calling
hasDeviceOwnerOrProfileOwner in DevicePolicyManagerService.LocalService
before resolving negative userIds to a real user. Moved the call to a point
when userId is already resolved.

bug: b/27538249
Change-Id: I760412978b3260523e9abcfe59d8e100ec4af12f
2016-03-09 13:38:15 -08:00
Kirill Grouchnikov
04c659299f Merge "Tweaks to ViewOverlay." into nyc-dev 2016-03-09 21:35:46 +00:00
Kirill Grouchnikov
b4b939cf1a Tweaks to ViewOverlay.
* Clarify Javadocs for add / remove when called with the same
Drawable.
* Add @NonNull annotation to all add / remove APIs and throw
IllegalArgumentException when null value is passed.

Bug: 27528798
Change-Id: Ied8f28c70775309e4fa85aff6a7202c1a0eb6aa3
2016-03-09 16:34:49 -05:00
Chad Brubaker
ff400f3229 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev
am: 8064b4a687

* commit '8064b4a687b41377bff5ea767dedc9c8a366cb51':
  Allow debug-overrides to be specified in an extra resource
2016-03-09 20:50:14 +00:00
Chad Brubaker
8064b4a687 Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev 2016-03-09 20:45:23 +00:00
Vadim Tryshev
93a914a77f Fixing bugs with peeking a wallpaper.
1. Cached wallpaper from one user could be retrieved
for another user. Fixed with adding a mCachedWallpaperUserId
member.

2. mDefault wallpaper was returned too early. Moved down
so that default wallpaper could be returned only after
making sure that system wallpaper is unspecified.

Bug: 25185253
Change-Id: Ie620621e5c4039d5d680211150aa5327f321f11a
2016-03-09 20:36:01 +00:00
Alan Viverette
60adb4d264 Merge "Clean up SimpleMonthView formatters" into nyc-dev
am: 366e137c0e

* commit '366e137c0e6afe420131560c5783627ed9e06625':
  Clean up SimpleMonthView formatters
2016-03-09 18:48:54 +00:00
Alan Viverette
366e137c0e Merge "Clean up SimpleMonthView formatters" into nyc-dev 2016-03-09 18:40:47 +00:00
Chris Wren
2be6b136a8 Merge "add a ranking service to the rocket" into nyc-dev
am: a82662e3f5

* commit 'a82662e3f5d6a36df9d5c0d33d5847d08273bd93':
  add a ranking service to the rocket
2016-03-09 16:47:46 +00:00
Alan Viverette
669b25d58e Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev
am: 2c18cd0823

* commit '2c18cd082359533d326081756b4fd2df2164a253':
  Set DatePickerListener last during DatePickerDialog construction
2016-03-09 16:28:52 +00:00
Robin Lee
c3152fe087 Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev
am: 9acee934de

* commit '9acee934de1f2242f29a57a854df837e8f38fa04':
  Corrections to javadoc for install & removeKeyPair
2016-03-09 16:28:51 +00:00
Chris Wren
a82662e3f5 Merge "add a ranking service to the rocket" into nyc-dev 2016-03-09 16:26:56 +00:00
Alan Viverette
2c18cd0823 Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev 2016-03-09 15:52:35 +00:00
Robin Lee
9acee934de Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev 2016-03-09 15:48:25 +00:00
Robin Lee
a1b290e11a Corrections to javadoc for install & removeKeyPair
Making these more consistent - refer to 'certificate and private key
pair' in titles instead of 'credentials'. It is still used in one place
where 'credentials' makes sense.

Bug: 27533004
Change-Id: Ied80017c6f391646b10921b011be35eea113373f
2016-03-09 14:38:36 +00:00
Paul Lawrence
3cb05abdb2 Merge "Add API to IMountService to get encryption state" into nyc-dev
am: d5a3f3df40

* commit 'd5a3f3df4097e4a57e0d31fba994c91d8996abf8':
  Add API to IMountService to get encryption state
2016-03-09 13:48:43 +00:00