OSDN Git Service

android-x86/frameworks-base.git
8 years agoFix unit tests
Esteban Talavera [Thu, 4 Feb 2016 18:25:22 +0000 (18:25 +0000)]
Fix unit tests

http://ag/858485 added a new flag and the mockito didn't match
the call any more

Change-Id: I8f99b1b6063488aeced08513b11c79bf0162006e

8 years agoMerge "Add new API function createAndManageUser"
Philipp Weiß [Mon, 25 Jan 2016 18:00:27 +0000 (18:00 +0000)]
Merge "Add new API function createAndManageUser"

8 years agoMerge "Add constants for EmergencyInfo app."
Maria Garcia Puyol [Mon, 25 Jan 2016 17:56:06 +0000 (17:56 +0000)]
Merge "Add constants for EmergencyInfo app."

8 years agoMerge "Show dialog when launching work apps is not possible."
Rubin Xu [Mon, 25 Jan 2016 17:51:22 +0000 (17:51 +0000)]
Merge "Show dialog when launching work apps is not possible."

8 years agoAdd constants for EmergencyInfo app.
mariagpuyol [Thu, 21 Jan 2016 21:53:21 +0000 (13:53 -0800)]
Add constants for EmergencyInfo app.

Bug: 23591361
Bug: 26688835
Change-Id: If1039356468d173522132df252e81807cdc756c8

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 17:43:26 +0000 (17:43 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 17:39:25 +0000 (18:39 +0100)]
Import translations. DO NOT MERGE

Change-Id: I46b3169c14c0f30697eaa3e200b8bbf856f558b5
Auto-generated-cl: translation import

8 years agoMerge "Turn off profile by stopping the user."
Rubin Xu [Mon, 25 Jan 2016 17:33:43 +0000 (17:33 +0000)]
Merge "Turn off profile by stopping the user."

8 years agoMerge "Clear binder calling identity before mutating secure settings."
Svetoslav Ganov [Mon, 25 Jan 2016 17:24:02 +0000 (17:24 +0000)]
Merge "Clear binder calling identity before mutating secure settings."

8 years agoMerge "Improved trust error messaging (1/2)"
Adrian Roos [Mon, 25 Jan 2016 17:20:11 +0000 (17:20 +0000)]
Merge "Improved trust error messaging (1/2)"

8 years agoMerge "Fixed javadoc so @hide annotations don't show up in the API."
Felipe Leme [Mon, 25 Jan 2016 17:13:51 +0000 (17:13 +0000)]
Merge "Fixed javadoc so @hide annotations don't show up in the API."

8 years agoClear binder calling identity before mutating secure settings.
Svet Ganov [Mon, 25 Jan 2016 17:12:41 +0000 (09:12 -0800)]
Clear binder calling identity before mutating secure settings.

The accessibility manager service changes secure settings without
clearing binder calling identnty. Luckily it worked for a long
time as the calls resulting in a secure setting change were not
made on a binder thread. Now we clear calling identity before
mutating secure settings - note that we alsways do this after
a security check, hece it is safe.

bug:26766532

Change-Id: Icb188e6de1a134f38de0bdb23c67fa4ff2806ba4

8 years agoMerge "stash FrameStatsObservers when mAttachInfo is null"
Andres Morales [Mon, 25 Jan 2016 16:51:37 +0000 (16:51 +0000)]
Merge "stash FrameStatsObservers when mAttachInfo is null"

8 years agoMerge "expose hwui frame stats through FrameStatsObserver"
Andres Morales [Mon, 25 Jan 2016 16:51:14 +0000 (16:51 +0000)]
Merge "expose hwui frame stats through FrameStatsObserver"

8 years agoMerge "a step toward enforcing unique metrics log IDs"
Chris Wren [Mon, 25 Jan 2016 16:37:55 +0000 (16:37 +0000)]
Merge "a step toward enforcing unique metrics log IDs"

8 years agoMerge "Replace SkALWAYSBREAK with equivalent Android macros."
Tom Hudson [Mon, 25 Jan 2016 16:33:59 +0000 (16:33 +0000)]
Merge "Replace SkALWAYSBREAK with equivalent Android macros."

8 years agoTurn off profile by stopping the user.
Rubin Xu [Thu, 21 Jan 2016 18:06:00 +0000 (18:06 +0000)]
Turn off profile by stopping the user.

Bug: 22541941
Change-Id: I713ab9b87f3dd1b7bd6206af137562d20a44d76d

8 years agoMerge "Prevent crash and ANR dialogs in VR mode"
Adrian Roos [Mon, 25 Jan 2016 16:24:24 +0000 (16:24 +0000)]
Merge "Prevent crash and ANR dialogs in VR mode"

8 years agoa step toward enforcing unique metrics log IDs
Chris Wren [Mon, 11 Jan 2016 19:49:26 +0000 (14:49 -0500)]
a step toward enforcing unique metrics log IDs

First of several change lists:
1. Add in the new proto (this CL)
2. Migrate the existing code over to the proto.
3. Remove MetricsConstants once it is unused.

Bug: 26442178
Change-Id: Ic24829246af8ec5b202e39a85960aac5cf336c33

8 years agoMerge "API to listen in on the synthesized audio."
Niels Egberts [Mon, 25 Jan 2016 16:19:10 +0000 (16:19 +0000)]
Merge "API to listen in on the synthesized audio."

8 years agoImproved trust error messaging (1/2)
Adrian Roos [Tue, 12 Jan 2016 19:29:03 +0000 (20:29 +0100)]
Improved trust error messaging (1/2)

Tracks why trust agents are disabled and shows
a generic message on the keyguard. Dedicated strings
in follow-up.

Bug: 22704995
Change-Id: Ibb4fd9c9386c4dc12f0734004502b9a9cc6ded79

8 years agoAdd new API function createAndManageUser
phweiss [Mon, 25 Jan 2016 13:48:59 +0000 (14:48 +0100)]
Add new API function createAndManageUser

This is a reduced version of the (deprecated) function
createAndInitializeUser, that allows the device owner to create a
new user and pass a bundle with information for initialization. The
new version of the function has the same functionality, but the
profile owner of the new user is always the device owner.

A flag can be specified to skip the setup wizard for the new user.

The new user is not started in the background, as opposed to how
createAndInitializeUser did it. Instead, the bundle with
initialization information is stored and will be broadcast when the
user is started for the first time.

Bug: 2528873225860170
Change-Id: I4e1aea6d2b7821b412c131e88454dff5934192aa

8 years agoReplace SkALWAYSBREAK with equivalent Android macros.
Derek Sollenberger [Mon, 25 Jan 2016 15:29:35 +0000 (10:29 -0500)]
Replace SkALWAYSBREAK with equivalent Android macros.

Change-Id: Icb7786c789915375d7d8754fc8536302c1020858

8 years agoAPI to listen in on the synthesized audio.
Niels Egberts [Fri, 20 Nov 2015 11:44:25 +0000 (11:44 +0000)]
API to listen in on the synthesized audio.

Change-Id: Ic943d39a0540f0061ef6f629e4934dc71f69ab6b

8 years agoMerge "Add additional APIs supported work on the parent DPM instance"
Esteban Talavera [Mon, 25 Jan 2016 15:19:06 +0000 (15:19 +0000)]
Merge "Add additional APIs supported work on the parent DPM instance"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 14:05:34 +0000 (14:05 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 14:04:23 +0000 (06:04 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6198abea42fededfce4ee9be2c7a88523ace87ca
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 13:45:14 +0000 (13:45 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 13:44:26 +0000 (13:44 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 13:43:23 +0000 (05:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic795f08684fc10e54499e25b31f4a3db3cbec981
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 13:40:21 +0000 (05:40 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id69e1f05426df237d87764464acd6997ed22cff8
Auto-generated-cl: translation import

8 years agoMerge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 25 Jan 2016 13:29:23 +0000 (13:29 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 25 Jan 2016 13:20:39 +0000 (05:20 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8f438e455cdd8053c92304766b84d327fd83ee9e
Auto-generated-cl: translation import

8 years agoImplement user affiliation
Bartosz Fabianowski [Mon, 25 Jan 2016 13:18:43 +0000 (14:18 +0100)]
Implement user affiliation

A user/profile is considered affiliated if it is managed by the same
entity as the device. This is determined by having the device owner and
profile owners specify a set of opaque affiliation ids each. If the sets
intersect, they must have come from the same source, which means that the
device owner and profile owner are controlled by the same entity.

BUG=25599229

Change-Id: I393fe0de70272307ed3c811aaba4b48a5109c562

8 years agoAdd additional APIs supported work on the parent DPM instance
Esteban Talavera [Mon, 11 Jan 2016 15:37:55 +0000 (15:37 +0000)]
Add additional APIs supported work on the parent DPM instance

Bug: 22543972
Change-Id: I05061e34d120c64d5c49ca6b7b4014d7dadb68f4

8 years agoAdd new APIs to test-current.txt
Martijn Coenen [Mon, 25 Jan 2016 10:33:52 +0000 (11:33 +0100)]
Add new APIs to test-current.txt

Change-Id: I187fe73c9ce47e4f4ed74c1be8ce70cf66bd52cc

8 years agoMerge "Implementation of HCE for NFC-F." am: e168012ff2
Martijn Coenen [Mon, 25 Jan 2016 10:00:32 +0000 (10:00 +0000)]
Merge "Implementation of HCE for NFC-F." am: e168012ff2
am: cf2f9d0966

* commit 'cf2f9d0966af01eb269b9ce6f2d08870647dd22f':
  Implementation of HCE for NFC-F.

8 years agoMerge "Implementation of HCE for NFC-F."
Martijn Coenen [Mon, 25 Jan 2016 09:56:20 +0000 (09:56 +0000)]
Merge "Implementation of HCE for NFC-F."
am: e168012ff2

* commit 'e168012ff21408f8be85040bb4ac977061519f62':
  Implementation of HCE for NFC-F.

8 years agoMerge "Implementation of HCE for NFC-F."
Martijn Coenen [Mon, 25 Jan 2016 09:48:43 +0000 (09:48 +0000)]
Merge "Implementation of HCE for NFC-F."

8 years agoMerge "Update "accessing files" notification resources."
Daichi Hirono [Mon, 25 Jan 2016 08:28:23 +0000 (08:28 +0000)]
Merge "Update "accessing files" notification resources."

8 years agoUpdate "accessing files" notification resources.
Daichi Hirono [Mon, 25 Jan 2016 07:06:57 +0000 (16:06 +0900)]
Update "accessing files" notification resources.

 * Replace tentative resources with real ones.
 * Show the notification for each device as per request from UX.

BUG=26625702

Change-Id: Ibcfe7075e4827d5aee216ce5c0007f6dd4572efe

8 years agoMerge "ImageReader: fix missing pixel stride"
Yin-Chia Yeh [Mon, 25 Jan 2016 02:26:11 +0000 (02:26 +0000)]
Merge "ImageReader: fix missing pixel stride"

8 years agoMerge "Add eventsSupported property to MtpDeviceInfo."
Daichi Hirono [Mon, 25 Jan 2016 01:59:27 +0000 (01:59 +0000)]
Merge "Add eventsSupported property to MtpDeviceInfo."

8 years agoAdd eventsSupported property to MtpDeviceInfo.
Daichi Hirono [Thu, 21 Jan 2016 10:55:45 +0000 (19:55 +0900)]
Add eventsSupported property to MtpDeviceInfo.

The property provides the set of event code that are supported by
MtpDevice.

BUG=26147375

Change-Id: I54be75e4bb52ddfe9aba8630538ddd32d1a641c8

8 years agoMerge "Make ACTION_QUICK_VIEW public."
Tomasz Mikolajewski [Mon, 25 Jan 2016 01:04:02 +0000 (01:04 +0000)]
Merge "Make ACTION_QUICK_VIEW public."

8 years agoMerge "Camera2: add surface set ID"
Zhijun He [Sun, 24 Jan 2016 17:42:43 +0000 (17:42 +0000)]
Merge "Camera2: add surface set ID"

8 years agoAdds Settings.System.FONT_SCALE observer to ActivityManagerService
Casey Burkhardt [Wed, 30 Dec 2015 02:03:36 +0000 (18:03 -0800)]
Adds Settings.System.FONT_SCALE observer to ActivityManagerService

Changes to Settings.System.FONT_SCALE were not being handled by any service,
which required a device reboot for any changes to take effect.  Changes to
this field by the Settings app worked as expected only because it is able to
poke ActivityManager with an updated configuration, whereas unbundled
applications cannot.

This also ensures the setting value is backed up and doesn't conflict with
a configured value from accessibility onboarding during restore.

Bug:23033258
Change-Id: I98d4aed2f9f5893d054e6b10c4dfda406de8eba2

8 years agoVoice Interaction from within an Activity
Amith Yamasani [Sun, 17 Jan 2016 23:36:19 +0000 (15:36 -0800)]
Voice Interaction from within an Activity

This allows an app to show a voice search button
and invoke a voice interaction session for use
within the activity. Once the activity exits, the
session is stopped.

Test application has a new activity that
demonstrates it with the test voice interaction
service.

This initial version is functional enough for
an integration test, with some more tests
and improvements to come later.

Bug: 22791070
Change-Id: Ib1e5bc8cae1fde40570c999b9cf4bb29efe4916d

8 years agoMerge "Removed some left over log spam."
Wale Ogunwale [Sun, 24 Jan 2016 02:16:18 +0000 (02:16 +0000)]
Merge "Removed some left over log spam."

8 years agoRemoved some left over log spam.
Wale Ogunwale [Sun, 24 Jan 2016 02:14:58 +0000 (18:14 -0800)]
Removed some left over log spam.

Change-Id: Iaac41b7202b7634185bf522dfab36832c4830bba

8 years agoMerge "Camera: add post RAW sensitivity keys"
Yin-Chia Yeh [Sat, 23 Jan 2016 23:05:03 +0000 (23:05 +0000)]
Merge "Camera: add post RAW sensitivity keys"

8 years agoMerge "Make missed call action public"
Sailesh Nepal [Sat, 23 Jan 2016 18:28:31 +0000 (18:28 +0000)]
Merge "Make missed call action public"

8 years agoMerge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f
Jorim Jaggi [Sat, 23 Jan 2016 03:47:29 +0000 (03:47 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService" am: b7fbe1104f
am: 5d6da4eab0

* commit '5d6da4eab024c13afbfef5cfec0f9f2b19168318':
  NullPointerException when starting VoiceInteractionManagerService

8 years agoFixed javadoc so @hide annotations don't show up in the API.
Felipe Leme [Sat, 23 Jan 2016 02:27:03 +0000 (18:27 -0800)]
Fixed javadoc so @hide annotations don't show up in the API.

BUG: 26082535

Change-Id: Ifb5ddedddc87bc65dc5158286503c64581b5a4f3

8 years agoMerge "Minor fixes on string resources due to translation issues."
Felipe Leme [Sat, 23 Jan 2016 02:43:18 +0000 (02:43 +0000)]
Merge "Minor fixes on string resources due to translation issues."

8 years agoMinor fixes on string resources due to translation issues.
Felipe Leme [Sat, 23 Jan 2016 02:27:38 +0000 (18:27 -0800)]
Minor fixes on string resources due to translation issues.

BUG: 26723186
BUG: 26733350
Change-Id: I17d5f7c6845ad1dea00b1085bf57073d16a3fd44

8 years agoMerge "NullPointerException when starting VoiceInteractionManagerService"
Jorim Jaggi [Sat, 23 Jan 2016 02:18:13 +0000 (02:18 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"
am: b7fbe1104f

* commit 'b7fbe1104fd93b426dd6a6f2ed9dfc9cb12b4dd8':
  NullPointerException when starting VoiceInteractionManagerService

8 years agoMerge "NullPointerException when starting VoiceInteractionManagerService"
Jorim Jaggi [Sat, 23 Jan 2016 02:09:36 +0000 (02:09 +0000)]
Merge "NullPointerException when starting VoiceInteractionManagerService"

8 years agoImageReader: fix missing pixel stride
Yin-Chia Yeh [Sat, 23 Jan 2016 02:02:58 +0000 (18:02 -0800)]
ImageReader: fix missing pixel stride

Change-Id: Ie34cb51fee90e2d5624663fa23da4093fec435e2

8 years agoMerge "Fix issue with stack not invalidating when only focus state changes."
Winson Chung [Sat, 23 Jan 2016 01:54:59 +0000 (01:54 +0000)]
Merge "Fix issue with stack not invalidating when only focus state changes."

8 years agoFixed a clipping bug when expanding children notification
Selim Cinek [Sat, 23 Jan 2016 01:48:22 +0000 (17:48 -0800)]
Fixed a clipping bug when expanding children notification

When children are expanded with a finger we still need to clip!

Change-Id: Ie66bb0ba690163bcabdc503a03f1e23869ec175d

8 years agoMake missed call action public
Sailesh Nepal [Fri, 22 Jan 2016 03:26:20 +0000 (19:26 -0800)]
Make missed call action public

This CL makes the missed call notification action public. This will be
used by the dialer app to show it's own missed call UI.

See ag/850080 for more info.

BUG: 22857261

Change-Id: Ifae82d3036a278e5619edc8c766a1d0781296e72

8 years agoMerge "Relaunch activity resumed if it got resumed before relaunching."
Filip Gruszczynski [Sat, 23 Jan 2016 01:15:05 +0000 (01:15 +0000)]
Merge "Relaunch activity resumed if it got resumed before relaunching."

8 years agoRelaunch activity resumed if it got resumed before relaunching.
Filip Gruszczynski [Sat, 23 Jan 2016 00:43:48 +0000 (16:43 -0800)]
Relaunch activity resumed if it got resumed before relaunching.

This fixes following scenario:
1) first activity starts second activity and expects results; first
activity gets paused;
2) second activity finishes and returns a result;
3) first activity is still paused and receives the result from the second
activity; first activty requests a local relaunch; relaunch gets
scheduled and is marked as launching paused (because the activity is
still paused)
4) first activity resumes;
5) first activity relaunches and finishes in paused state.

The fix makes it drop the information about launching paused when it
gets resumed in step 4.

Bug: 25674611
Change-Id: Ieeef3f0d5c311679882fdc59c13fd8a99e3d3a20

8 years agoMerge "Remove GregorianCalendar hack" am: 187c022bf1
Deepanshu Gupta [Sat, 23 Jan 2016 01:05:26 +0000 (01:05 +0000)]
Merge "Remove GregorianCalendar hack" am: 187c022bf1
am: 08f736e7b1

* commit '08f736e7b143f825fe3c29e70e9b505bbf8e1ae6':
  Remove GregorianCalendar hack

8 years agoMerge "Fix broken SearchViewUiTest."
Steve McKay [Sat, 23 Jan 2016 00:54:40 +0000 (00:54 +0000)]
Merge "Fix broken SearchViewUiTest."

8 years agoMerge "Change mouse pointer when drag and drop is active"
Vladislav Kaznacheev [Sat, 23 Jan 2016 00:26:01 +0000 (00:26 +0000)]
Merge "Change mouse pointer when drag and drop is active"

8 years agoFix broken SearchViewUiTest.
Steve McKay [Sat, 23 Jan 2016 00:03:57 +0000 (16:03 -0800)]
Fix broken SearchViewUiTest.

Change-Id: I0df509ff6307f9aeb32d9fbfaaf68de59507e3f7

8 years agoMerge "Remove GregorianCalendar hack"
Deepanshu Gupta [Sat, 23 Jan 2016 00:02:05 +0000 (00:02 +0000)]
Merge "Remove GregorianCalendar hack"
am: 187c022bf1

* commit '187c022bf187f137d48d9031c43cfc233c9fc158':
  Remove GregorianCalendar hack

8 years agoMerge "Remove GregorianCalendar hack"
Deepanshu Gupta [Fri, 22 Jan 2016 23:53:07 +0000 (23:53 +0000)]
Merge "Remove GregorianCalendar hack"

8 years agoMerge "Change "touch" to "tap"."
Steve McKay [Fri, 22 Jan 2016 23:46:17 +0000 (23:46 +0000)]
Merge "Change "touch" to "tap"."

8 years agoChange "touch" to "tap".
Steve McKay [Fri, 22 Jan 2016 23:44:31 +0000 (15:44 -0800)]
Change "touch" to "tap".

Bug: 26744850
Change-Id: I2f0f0c817ea40de4fbc6ef21e68ccbde293d3135

8 years agoCamera: add post RAW sensitivity keys
Yin-Chia Yeh [Tue, 19 Jan 2016 03:13:47 +0000 (19:13 -0800)]
Camera: add post RAW sensitivity keys

Codegen change.

Bug: 26625646
Change-Id: I1b84fa5545db73002640d03fa6b9786986a3afdf

8 years agoFix issue with stack not invalidating when only focus state changes.
Winson [Fri, 22 Jan 2016 19:34:38 +0000 (11:34 -0800)]
Fix issue with stack not invalidating when only focus state changes.

- Adding callback to invalidate when focus state changes.
- Fixing issue where we were posting the invalidate, causing everything
  to lag by 1 frame
- Fixing issue where we weren’t passing the cancel-enter animation flag
  down when setting focused tasks

Change-Id: I218ec78dc0e4e22e59ffcef03a1bc91d08b7c18b

8 years agoMerge "Add support for renaming documents"
Aga Wronska [Fri, 22 Jan 2016 23:26:35 +0000 (23:26 +0000)]
Merge "Add support for renaming documents"

8 years agoMerge "Expanded wallpaper APIs for keyguard and change detection"
Chris Tate [Fri, 22 Jan 2016 23:24:54 +0000 (23:24 +0000)]
Merge "Expanded wallpaper APIs for keyguard and change detection"

8 years agoMerge "Provide a way to supply different algorithms for token binding key"
Selim Gurun [Fri, 22 Jan 2016 22:52:51 +0000 (22:52 +0000)]
Merge "Provide a way to supply different algorithms for token binding key"

8 years agoProvide a way to supply different algorithms for token binding key
Selim Gurun [Fri, 22 Jan 2016 19:36:10 +0000 (11:36 -0800)]
Provide a way to supply different algorithms for token binding key

Bug: 22665752

The user of the API can provide different algorithms for key generation.
The API should also provide information about which algorithm is
used for generating the key.

Change-Id: I1d671ba351ca495b031b159132f33291a4f33aac

8 years agoMerge "Move localeScriptWasProvided to end of ResTable_config"
Roozbeh Pournader [Fri, 22 Jan 2016 22:48:42 +0000 (22:48 +0000)]
Merge "Move localeScriptWasProvided to end of ResTable_config"

8 years agoMerge "Logging of unlock attempts and device locking to security log"
Michal Karpinski [Fri, 22 Jan 2016 22:48:17 +0000 (22:48 +0000)]
Merge "Logging of unlock attempts and device locking to security log"

8 years agoMove localeScriptWasProvided to end of ResTable_config
Roozbeh Pournader [Fri, 22 Jan 2016 22:44:53 +0000 (14:44 -0800)]
Move localeScriptWasProvided to end of ResTable_config

This is to try and be safer with different versions potentially
interpreting the data differently.

Change-Id: I599b6a20d908e8379727a5b06cc6631f1954bcff

8 years agoMerge "Minor fixes"
Suprabh Shukla [Fri, 22 Jan 2016 22:43:38 +0000 (22:43 +0000)]
Merge "Minor fixes"

8 years agoMerge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 am:...
Thierry Strudel [Fri, 22 Jan 2016 22:35:05 +0000 (22:35 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793 am: e8b476e8e8
am: afbf1570ac

* commit 'afbf1570acfac5dfc28196c3f4b424fdaef85508':
  Don't assume kernel tick is 100Hz

8 years agoMerge "implement onNotificationEnqueued callback"
Chris Wren [Fri, 22 Jan 2016 22:32:55 +0000 (22:32 +0000)]
Merge "implement onNotificationEnqueued callback"

8 years agoMerge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793
Thierry Strudel [Fri, 22 Jan 2016 22:28:41 +0000 (22:28 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev am: 0064c4c793
am: e8b476e8e8

* commit 'e8b476e8e81ee8bc4fe70fbc78db2f496b2aa023':
  Don't assume kernel tick is 100Hz

8 years agoMerge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev
Thierry Strudel [Fri, 22 Jan 2016 22:20:30 +0000 (22:20 +0000)]
Merge "Don\'t assume kernel tick is 100Hz" into mnc-dr1.5-dev
am: 0064c4c793

* commit '0064c4c79341bcb47bcb5b9ff568871f34f1dc63':
  Don't assume kernel tick is 100Hz

8 years agoMerge "AAPT2: Allow specifying non-final IDS when building 'legacy' style libraries"
Adam Lesinski [Fri, 22 Jan 2016 22:12:01 +0000 (22:12 +0000)]
Merge "AAPT2: Allow specifying non-final IDS when building 'legacy' style libraries"

8 years agoAAPT2: Allow specifying non-final IDS when building 'legacy' style libraries
Adam Lesinski [Fri, 22 Jan 2016 22:09:53 +0000 (14:09 -0800)]
AAPT2: Allow specifying non-final IDS when building 'legacy' style libraries

Real libraries will be built correctly, but since we are not doing that
yet, support the old way and allow a flag --non-final-ids to remove
the final modifier from R.java.

Change-Id: Iad55fb9140e55dbb0f41d0d55f2e2bd958294c8e

8 years agoMerge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev
Thierry Strudel [Fri, 22 Jan 2016 22:07:32 +0000 (22:07 +0000)]
Merge "Don't assume kernel tick is 100Hz" into mnc-dr1.5-dev

8 years agostash FrameStatsObservers when mAttachInfo is null
Andres Morales [Fri, 22 Jan 2016 17:49:09 +0000 (09:49 -0800)]
stash FrameStatsObservers when mAttachInfo is null

register in dispatchAttachedToWindow

Change-Id: Ida01d49e5886e4a715e4f16a378ab0d9d9986c3d

8 years agoCheck apps idle states on time changes am: c465e71cdc am: d4bd4cb4b1
Amith Yamasani [Fri, 22 Jan 2016 21:49:37 +0000 (21:49 +0000)]
Check apps idle states on time changes am: c465e71cdc am: d4bd4cb4b1
am: 375901244c

* commit '375901244c051d85a63d7ca83807e5f1ca7a5d0a':
  Check apps idle states on time changes

8 years agoAdd support for renaming documents
Aga Wronska [Thu, 21 Jan 2016 00:32:33 +0000 (16:32 -0800)]
Add support for renaming documents

- Add rename dialog
- Add rename menu option
- Enable rename menu option only when renaming supported
- Rename files and directories
- Present error message if renaming fails

Bug: 20493815
Change-Id: Ic7386d14e3876655fb19245b9a90b4c67a4febb4

8 years agoMerge "Specify the time units for waitForActivityWithTimeout"
Ben Gruver [Fri, 22 Jan 2016 21:27:44 +0000 (21:27 +0000)]
Merge "Specify the time units for waitForActivityWithTimeout"

8 years agoSpecify the time units for waitForActivityWithTimeout
Ben Gruver [Fri, 22 Jan 2016 21:11:11 +0000 (13:11 -0800)]
Specify the time units for waitForActivityWithTimeout

Change-Id: I21bf943e03d1f85094af5e7579fefb27f302f16c

8 years agoexpose hwui frame stats through FrameStatsObserver
Andres Morales [Tue, 15 Dec 2015 23:21:31 +0000 (15:21 -0800)]
expose hwui frame stats through FrameStatsObserver

Change-Id: I88884bafc8e2f6d7f67a36d3609490e83cf8afd5

8 years agoCheck apps idle states on time changes am: c465e71cdc
Amith Yamasani [Fri, 22 Jan 2016 20:58:46 +0000 (20:58 +0000)]
Check apps idle states on time changes am: c465e71cdc
am: d4bd4cb4b1

* commit 'd4bd4cb4b1faa8663cc8dde4d9bab15a9ec764d3':
  Check apps idle states on time changes

8 years agoMerge "Log important VrManagerService lifecycle events."
Ruben Brunk [Fri, 22 Jan 2016 20:55:10 +0000 (20:55 +0000)]
Merge "Log important VrManagerService lifecycle events."

8 years agoCheck apps idle states on time changes
Amith Yamasani [Fri, 22 Jan 2016 20:51:34 +0000 (20:51 +0000)]
Check apps idle states on time changes
am: c465e71cdc

* commit 'c465e71cdc401e1565c29a895a5c6d366ba5344c':
  Check apps idle states on time changes

8 years agoLog important VrManagerService lifecycle events.
Ruben Brunk [Fri, 22 Jan 2016 20:48:26 +0000 (12:48 -0800)]
Log important VrManagerService lifecycle events.

- Events are rare, and user triggered, so will not
  cause logcat spamming.

Change-Id: I2bdf29b0ca7d86ab64e9a20ee018e3f9e8eb1e5d

8 years agoExpanded wallpaper APIs for keyguard and change detection
Christopher Tate [Thu, 21 Jan 2016 02:13:17 +0000 (18:13 -0800)]
Expanded wallpaper APIs for keyguard and change detection

* There is a nonzero integer ID associated with the currently-set
  wallpaper image, and this changes every time any caller sets
  the wallpaper.  This is to support external change detection.

* The API now permits a caller to independently set imagery as
  the new general system wallpaper or keyguard-specific wallpaper.
  The backing implementation is not yet plumbed through, but the
  API is now in place for clients to safely write code against.

Bug 25454501
Bug 25454162

Change-Id: I4934f102d5630485bf2870d83664145ae68a3695