Daniel Micay
b9e8f4602a
Merge "fix SeekBarPreference support for summaries" am: 06ce16a54c
...
am: b562aaaa4c
2016-03-10 15:35:50 +00:00
Daniel Micay
b562aaaa4c
Merge "fix SeekBarPreference support for summaries"
...
am: 06ce16a54c
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
377d000e59
Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev am: ef33726e14
...
am: c742752735
2016-03-10 02:30:29 +00:00
Hyunyoung Song
c742752735
Merge "Revert "Apply transformations while offsetting focused rects"" into nyc-dev
...
am: ef33726e14
2016-03-10 02:28:28 +00:00
Hyunyoung Song
4eb1a4e003
Revert "Apply transformations while offsetting focused rects"
...
b/27335262
This reverts commit 83e725da7a
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
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
ca3cbc1d63
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev am: 04a72a2a51
...
am: af2d5fb699
2016-03-10 01:02:12 +00:00
Joe Onorato
af2d5fb699
Merge "Add an API for apps to get their System Health / Battery Stats data." into nyc-dev
...
am: 04a72a2a51
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
0fe56494f3
Merge "Camera: codegen update" into nyc-dev am: 0ae49cc667
...
am: 1f85a37630
2016-03-10 00:34:05 +00:00
Yin-Chia Yeh
1f85a37630
Merge "Camera: codegen update" into nyc-dev
...
am: 0ae49cc667
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
7e4a7fcfae
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev am: 495d124a67
...
am: 837a5fd72d
2016-03-10 00:24:23 +00:00
Makoto Onuki
837a5fd72d
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev
...
am: 495d124a67
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
b6f9e05222
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev am: 6b432fa255
...
am: ffc1208daf
2016-03-10 00:11:09 +00:00
Jeff Sharkey
ffc1208daf
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev
...
am: 6b432fa255
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
aa0dfc8c41
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev am: 4eeb7e2cae
...
am: ed633e97e3
2016-03-09 23:52:35 +00:00
Todd Kennedy
a40c3dfac2
Merge "remove splits" into nyc-dev am: f96eee36df
...
am: 33e6d759cb
2016-03-09 23:52:35 +00:00
Vadim Tryshev
ed633e97e3
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev
...
am: 4eeb7e2cae
2016-03-09 23:50:35 +00:00
Todd Kennedy
33e6d759cb
Merge "remove splits" into nyc-dev
...
am: f96eee36df
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
5b416edcff
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev am: 93720d5729
...
am: 7051cad205
2016-03-09 23:39:22 +00:00
Jeff Sharkey
7051cad205
Merge "Log when pre-N apps send too much to DropBox." into nyc-dev
...
am: 93720d5729
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
108853ba12
Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
...
am: 027fd0ae95
2016-03-09 22:35:38 +00:00
Makoto Onuki
027fd0ae95
Merge "ShortcutManager: add remaining APIs." into nyc-dev
...
am: 4a07c34ca8
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
6a643dbee7
Merge "Calling method in DPMS after resolving userId" into nyc-dev am: d7924b6063
...
am: 06a3c6d32c
2016-03-09 22:02:22 +00:00
Suprabh Shukla
06a3c6d32c
Merge "Calling method in DPMS after resolving userId" into nyc-dev
...
am: d7924b6063
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
73bbdfe3fd
Merge "Tweaks to ViewOverlay." into nyc-dev am: 04c659299f
...
am: 44f19eebb2
2016-03-09 21:42:38 +00:00
Kirill Grouchnikov
44f19eebb2
Merge "Tweaks to ViewOverlay." into nyc-dev
...
am: 04c659299f
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
aa910eefe8
Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev am: 8064b4a687
...
am: ff400f3229
2016-03-09 20:52:24 +00:00
Chad Brubaker
ff400f3229
Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev
...
am: 8064b4a687
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
