Yin-Chia Yeh
0fe56494f3
Merge "Camera: codegen update" into nyc-dev am: 0ae49cc667
...
am: 1f85a37630
* commit '1f85a37630357f68beba0e06f036ac54ff279f83':
Camera: codegen update
2016-03-10 00:34:05 +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
7e4a7fcfae
Merge "ShortcutManaegr: load config from settings, also..." into nyc-dev am: 495d124a67
...
am: 837a5fd72d
* commit '837a5fd72d4ee48b94d3c9f5dc9a409ecfd3caf9':
ShortcutManaegr: load config from settings, also...
2016-03-10 00:24:23 +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
b6f9e05222
Merge "Restrict TrafficStats due to privacy concerns." into nyc-dev am: 6b432fa255
...
am: ffc1208daf
* commit 'ffc1208daf819e6f4cb87228f0ad58354999914f':
Restrict TrafficStats due to privacy concerns.
2016-03-10 00:11:09 +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
aa0dfc8c41
Merge "Fixing bugs with peeking a wallpaper." into nyc-dev am: 4eeb7e2cae
...
am: ed633e97e3
* commit 'ed633e97e35fd8d04a1e0bec812db08b002b30b2':
Fixing bugs with peeking a wallpaper.
2016-03-09 23:52:35 +00:00
Todd Kennedy
a40c3dfac2
Merge "remove splits" into nyc-dev am: f96eee36df
...
am: 33e6d759cb
* commit '33e6d759cb2707bdfd8439f5f2c20f6ec2062c0d':
remove splits
2016-03-09 23:52:35 +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
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
* commit '7051cad205e3ea3269c51811f5586e165d533af0':
Log when pre-N apps send too much to DropBox.
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
* 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
108853ba12
Merge "ShortcutManager: add remaining APIs." into nyc-dev am: 4a07c34ca8
...
am: 027fd0ae95
* commit '027fd0ae9512b57ec13448d292609ad41ebd0bb6':
ShortcutManager: add remaining APIs.
2016-03-09 22:35:38 +00: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
6a643dbee7
Merge "Calling method in DPMS after resolving userId" into nyc-dev am: d7924b6063
...
am: 06a3c6d32c
* commit '06a3c6d32c0c70457c7eb5eccf3395e867fb3b61':
Calling method in DPMS after resolving userId
2016-03-09 22:02:22 +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
73bbdfe3fd
Merge "Tweaks to ViewOverlay." into nyc-dev am: 04c659299f
...
am: 44f19eebb2
* commit '44f19eebb2e58677fc955b35701ed352d8ff1852':
Tweaks to ViewOverlay.
2016-03-09 21:42:38 +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
aa910eefe8
Merge "Allow debug-overrides to be specified in an extra resource" into nyc-dev am: 8064b4a687
...
am: ff400f3229
* commit 'ff400f322908d177a0561eea6ac473f2fcd7de29':
Allow debug-overrides to be specified in an extra resource
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
* 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
799c311d83
Merge "Clean up SimpleMonthView formatters" into nyc-dev am: 366e137c0e
...
am: 60adb4d264
* commit '60adb4d264fd4be3277a5b80d8021aa1b4d79107':
Clean up SimpleMonthView formatters
2016-03-09 18:51:00 +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
52165a7ab0
Merge "add a ranking service to the rocket" into nyc-dev am: a82662e3f5
...
am: 2be6b136a8
* commit '2be6b136a8d0f5de12a8e1f5a3c17c8b4fe27cf1':
add a ranking service to the rocket
2016-03-09 16:52:05 +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
c6dfb332ba
Merge "Set DatePickerListener last during DatePickerDialog construction" into nyc-dev am: 2c18cd0823
...
am: 669b25d58e
* commit '669b25d58e6b8840f39c95f76c79ab90c46e27e7':
Set DatePickerListener last during DatePickerDialog construction
2016-03-09 16:31:06 +00:00
Robin Lee
4a23e41cb4
Merge "Corrections to javadoc for install & removeKeyPair" into nyc-dev am: 9acee934de
...
am: c3152fe087
* commit 'c3152fe08749c12f017598a37e65277c180f05b6':
Corrections to javadoc for install & removeKeyPair
2016-03-09 16:31:05 +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