OSDN Git Service
Felipe Leme [Tue, 22 Dec 2015 22:09:25 +0000 (14:09 -0800)]
Minor improvements on 'Take bug report' Action.
Long press was returning true, which would not close the window.
Comments were outdated.
BUG:
26034608
Change-Id: Ia34906efff048299c709406039f86e7e14058259
Chad Brubaker [Mon, 21 Dec 2015 19:05:01 +0000 (19:05 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted" am:
a2f2c5c340
am:
c642e052f0
* commit '
c642e052f095d42882f46c2667d609136e269069':
Add hostname aware isCleartextTrafficPermitted
Chad Brubaker [Mon, 21 Dec 2015 19:01:01 +0000 (19:01 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
am:
a2f2c5c340
* commit '
a2f2c5c340b552b92088966734097845b76ea310':
Add hostname aware isCleartextTrafficPermitted
Chad Brubaker [Mon, 21 Dec 2015 18:52:48 +0000 (18:52 +0000)]
Merge "Add hostname aware isCleartextTrafficPermitted"
Pablo Ceballos [Mon, 21 Dec 2015 18:42:03 +0000 (18:42 +0000)]
Merge "Add GLES32 class and JNI"
Felipe Leme [Mon, 21 Dec 2015 18:08:43 +0000 (10:08 -0800)]
Removed duplicated entry added by bad merging skills.
BUG:
26274653
Change-Id: I68c5e95739a57123591daeb3988532badb89046d
Felipe Leme [Mon, 21 Dec 2015 17:58:22 +0000 (17:58 +0000)]
Merge "Handle bugreport screenshots on Shell."
Felipe Leme [Mon, 21 Dec 2015 17:49:25 +0000 (17:49 +0000)]
Merge "Added messages for the new "Take bug report" dialog."
Filip Gruszczynski [Mon, 21 Dec 2015 17:13:45 +0000 (17:13 +0000)]
Merge "Always elevate input method above the input target."
Filip Gruszczynski [Mon, 21 Dec 2015 17:12:15 +0000 (17:12 +0000)]
Merge "Prevent NPE in layer assignment, not all windows have a stack."
Filip Gruszczynski [Mon, 21 Dec 2015 16:56:41 +0000 (08:56 -0800)]
Always elevate input method above the input target.
Bug:
26286301
Change-Id: I02dd290c1dbababed26d34a7e61bb4d7bad5e9ac
Felipe Leme [Sat, 19 Dec 2015 00:12:41 +0000 (16:12 -0800)]
Handle bugreport screenshots on Shell.
Currently, the bugreport screenshots are taken by dumpstate and passed to
Shell as a path on BUGREPORT_RECEIVED; this change not only delegates the
screenshot taking to Shell, but also allows user to take more
screenshots while the bugreport is being generated.
As a result of this change, the final ACTION_SEND_MULTIPLE intent might
contain multiple screenshot attachments, all of them named
"screenshot-PREFIX-NUMBER.png", where PREFIX is the bugreport
name (either initial date provided by dumpstate or a name entered by the
user) and NUMBER is the sequential number of the screenshot as taken by
the user.
The screenshot is taken using screencap, which not only is simpler than
using Framework APIs, but also faster and less intrusive. The only
drawback is that it might fail if an OEM is not providing screencap; if
that happens in the field, we'll need to add fallback option to do it
using such APIs.
Prior to this change, all work done on BugreportProgressService was
executed in one single thread (through the ServiceHandler class) but the
code was guarded by unnecessary synchronization. Now there is another
thread (ScreenshotHandler) that will be used just for taking the
screenshot (so it doesn't handle the main thread). Despite the addition
of a new thread, the code was simplified to remove most synchronization
locks, excepted for the areas touched by both threads.
Once this change is submitted, the bugreport service will be changed so
it does not ask dumpstate to take a screenshot.
BUG:
26274653
Change-Id: I1df883e3c0ca6e3e3cad2522a6a99585f71abb75
Filip Gruszczynski [Mon, 21 Dec 2015 16:28:54 +0000 (08:28 -0800)]
Prevent NPE in layer assignment, not all windows have a stack.
Bug:
26285039
Change-Id: Ie7099a4ec3f1195295308755821c603975bff183
Jason Monk [Mon, 21 Dec 2015 15:13:52 +0000 (15:13 +0000)]
Merge "Color transforms for the tuner"
Geoff Mendal [Mon, 21 Dec 2015 15:05:35 +0000 (07:05 -0800)]
Import translations. DO NOT MERGE am:
fd87e92a42 -s ours am:
bb107a854d -s ours
am:
82bb06c8f7 -s ours
* commit '
82bb06c8f774bcdebdf0fc0de953f78c3b475b11':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 15:01:38 +0000 (15:01 +0000)]
Import translations. DO NOT MERGE am:
fd87e92a42 -s ours
am:
bb107a854d -s ours
* commit '
bb107a854d64b5c7ed4d8d93fc4c836e9e21c4c1':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 15:01:38 +0000 (15:01 +0000)]
Import translations. DO NOT MERGE am:
72675c67d0 -s ours
am:
254df7ab5f -s ours
* commit '
254df7ab5f938dd5bdd67bf10234df68d5b5d4a6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:31 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
72675c67d0 -s ours
* commit '
72675c67d052b69dbac3a01faf631de90533a1dd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:57:29 +0000 (14:57 +0000)]
Import translations. DO NOT MERGE
am:
fd87e92a42 -s ours
* commit '
fd87e92a42b659be5b120c59d9413d41e94b6753':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 21 Dec 2015 14:53:38 +0000 (06:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5348b439170faa76b7d85ce1ab04cebeb0a17c69
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 14:50:08 +0000 (06:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: If00b01a244af6221a01d0c060c58da7389fd1b35
Auto-generated-cl: translation import
Jason Monk [Tue, 8 Dec 2015 02:45:47 +0000 (21:45 -0500)]
Color transforms for the tuner
Change-Id: I615be65e2b020acd5520f93c04f426c4006221c5
Geoff Mendal [Mon, 21 Dec 2015 14:13:44 +0000 (14:13 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 21 Dec 2015 14:09:13 +0000 (14:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 21 Dec 2015 14:06:57 +0000 (14:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 21 Dec 2015 14:00:28 +0000 (06:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: I172a76921ba1c4825f3f1c550c713800e8ea2fc6
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 13:57:13 +0000 (05:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I868223c518e04d0b20a17a3aef29499312edeabb
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 13:45:54 +0000 (05:45 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iffacfe8c3bebd254f8fbddd71c2c3eab85d1628a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 21 Dec 2015 13:39:40 +0000 (05:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie9892490fa6ef1d6d531cafc34e8edc816b38a2f
Auto-generated-cl: translation import
Narayan Kamath [Mon, 21 Dec 2015 10:59:20 +0000 (10:59 +0000)]
Calin Juravle [Mon, 21 Dec 2015 09:57:12 +0000 (01:57 -0800)]
Merge "Pass app\'s code paths to the runtime" am:
db73912471
am:
7d7ab7ad3b
* commit '
7d7ab7ad3b096d28b274024705b3171e42bebdcd':
Pass app's code paths to the runtime
Calin Juravle [Mon, 21 Dec 2015 09:52:40 +0000 (09:52 +0000)]
Merge "Pass app\'s code paths to the runtime"
am:
db73912471
* commit '
db73912471df39aa527971f2884f37295616d3a9':
Pass app's code paths to the runtime
Calin Juravle [Mon, 21 Dec 2015 09:43:34 +0000 (09:43 +0000)]
Merge "Pass app's code paths to the runtime"
Tomasz Mikolajewski [Mon, 21 Dec 2015 06:03:39 +0000 (06:03 +0000)]
Merge "Add support for archives to ExternalStorageProvider."
Daichi Hirono [Mon, 21 Dec 2015 04:32:36 +0000 (04:32 +0000)]
Merge "Fix compiler error on com_android_mtp_AppFuse.cpp."
Daichi Hirono [Mon, 21 Dec 2015 04:13:57 +0000 (13:13 +0900)]
Fix compiler error on com_android_mtp_AppFuse.cpp.
The CL adds explicit assigning for reply_size to prevent 'unused'
compiler error.
Change-Id: I307758debb23b5bf56ddf71d54813b8cd81d8f49
Daichi Hirono [Mon, 21 Dec 2015 03:10:37 +0000 (03:10 +0000)]
Merge "Add AppFuse class and its JNI module."
Daichi Hirono [Mon, 14 Dec 2015 02:00:54 +0000 (11:00 +0900)]
Add AppFuse class and its JNI module.
BUG=
25756145
Change-Id: I10597e3377cf860412e006a118cd979b6f108af3
Jae Seo [Mon, 21 Dec 2015 01:00:06 +0000 (01:00 +0000)]
Merge "Add a class Javadoc for MediaBrowser.MediaItem"
Tomasz Mikolajewski [Wed, 25 Nov 2015 03:54:25 +0000 (12:54 +0900)]
Add support for archives to ExternalStorageProvider.
Bug:
20176812
Change-Id: If27cf7d6198d0abcd4458bfbfd27f870ad6d8f30
Jeff Sharkey [Sun, 20 Dec 2015 22:40:43 +0000 (22:40 +0000)]
Merge "Make JobSchedulerService encryption aware."
Jeff Sharkey [Sun, 20 Dec 2015 22:34:01 +0000 (15:34 -0700)]
Make JobSchedulerService encryption aware.
When a user is started, but a persisted job component doesn't appear
in the normal resolution list, we avoid enqueuing the job. Later
when the user is unlocked, we take another pass over the pending
jobs to see if they became available.
Load keyboard layouts from XML metadata regardless of crypto status,
since we don't need to spin up any remote code.
Add MATCH_SYSTEM_ONLY to make system logic easier to write when
looking for trusted components.
Sprinkle more annotations on ArrayUtils methods.
Bug:
26279465
Change-Id: Iec28e0bb46862b07d740b12a79f6360de68dab0f
Narayan Kamath [Sun, 20 Dec 2015 20:17:40 +0000 (20:17 +0000)]
Track libcore commit
85d69e16fe1e59e50c1ad228e754abf325088362.
Unhide Pattern.UNICODE_CHARACTER_CLASS.
Change-Id: I5734a3bbe69c825b2563739c953bbf6d98627ab3
Selim Cinek [Fri, 18 Dec 2015 01:01:17 +0000 (17:01 -0800)]
Fixed the maximum number of lines for the bigtext view
Since the summary is now in the header, we can allow one
more line in bigtext. Also made it look nicer if the
bigtext was empty, in case we always want to use bigtext
by default.
Change-Id: I13679de084757ef174b3bf53e75837a4d95ddc99
Selim Cinek [Fri, 18 Dec 2015 00:39:06 +0000 (16:39 -0800)]
Fixed that the expandButton was sometimes visible when it shouldnt
This happened when the collapsed height had the same height as the
expanded one.
Bug:
26185377
Change-Id: I9c37a8239cc87bf2192f48bc008700faf4afb5d9
Selim Cinek [Thu, 17 Dec 2015 23:36:53 +0000 (15:36 -0800)]
Made the layout consistent for the bigText style
When using BigText style with only 1 line the layout was inconsistent
leading to jumps in the layout.
Change-Id: I86234d4d4732183df738c387d2f9d5dd311b70f3
Selim Cinek [Thu, 17 Dec 2015 03:02:19 +0000 (19:02 -0800)]
Measuring the notifications at wrap_content height now
The notifications are now measured at wrap_content such
that the layout still looks good even if the text
was ommited instead of arbitrarily making it bigger.
This also fixes some small rounding issues where the
expanded notification was just a pixel bigger than
the collapsed version.
Bug:
26185377
Change-Id: Ie3339ff75680ab512446605055304576e058f588
Selim Cinek [Thu, 17 Dec 2015 01:26:49 +0000 (17:26 -0800)]
Fixed the minimum height of groups on the lockscreen
Also caching the notification minheight in the algorithm
far less agressively, because it led to bugs.
Change-Id: I57155103bf2700be2e98e686fdd0077ce8e8405b
Selim Cinek [Wed, 16 Dec 2015 01:01:44 +0000 (17:01 -0800)]
Reusing the notification algorithm now when rotating
The notification algorithm had some state which was simply
dropped on rotation and therefore weird things could happen.
This is now fixed.
Change-Id: Ibb3d007b3298f745743bd3a5889bccebebf8105a
Selim Cinek [Tue, 15 Dec 2015 19:45:36 +0000 (11:45 -0800)]
Fixed the redacted layout for groups
Also fixed a bug where the guts didn't have the
right size and in general cleaned up the intrinsic
height. The guts also animate nicely and the position
of their animation starts on the finger.
Change-Id: I62447dd77ace36161740dfdf3d18103524e2eb21
Selim Cinek [Tue, 15 Dec 2015 05:00:02 +0000 (21:00 -0800)]
Fixed the public notifications views on the lockscreen
The views were based on a legacy systemUI notification.
We are now creating it in Notification.java in order to
always have the latest visuals and avoiding duplicate work.
Change-Id: I3f544cad069a8eab34d4464404d020e06d7f6626
Selim Cinek [Sat, 12 Dec 2015 01:28:12 +0000 (17:28 -0800)]
Fixed a measuring bug with the notification children container
The notification children didn't respect the given dimensions
when measuring and was simply measuring itself as high as desired.
This lead to a bug where the parent could crash when a layer was
set on it.
We are now measuring the container at most with the height of
the given size and let children draw over our view bounds.
In oder to still allow touch in those regions we also
override the touch rect.
This also simplifies the rest of the touch handling.
Bug:
26159274
Change-Id: I728553a6386455e6632e2511be8a3e7cb447e89b
Selim Cinek [Sat, 12 Dec 2015 01:02:17 +0000 (17:02 -0800)]
Fixed a hole in the shade that could exist with heads up
Change-Id: Ia7c36c717287e1c63218c105da83b41f0a40bc4b
Jeff Sharkey [Sat, 19 Dec 2015 22:04:48 +0000 (22:04 +0000)]
Merge "Better named encryption flags, start triaging."
Jeff Sharkey [Fri, 18 Dec 2015 17:57:58 +0000 (10:57 -0700)]
Better named encryption flags, start triaging.
Create distinct flags for encryption aware, unaware, and both, and
name them like the other MATCH_ flags.
Start adding logic to help triage all system internal callers to
verify that they've done their homework and thought about how to
handle apps while locked. Call sites in the system should either
ask for explicit matching behavior, or explicitly use the DEFAULT
match flag to indicate that they've been triaged to use the
default state-based matching.
Bug:
26250295
Change-Id: I86214e5c4f71a6dc72f06930800388713aecd107
Nick Kralevich [Sat, 19 Dec 2015 07:13:21 +0000 (07:13 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC" am:
78d5f90d98
am:
a87b9287a4
* commit '
a87b9287a4801ce39f30dbd84c3eac2f66c99992':
common_time_server.cpp: more O_CLOEXEC
Nick Kralevich [Sat, 19 Dec 2015 07:08:22 +0000 (07:08 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
am:
78d5f90d98
* commit '
78d5f90d98365987937b680862c4d88f3beaa4a3':
common_time_server.cpp: more O_CLOEXEC
Nick Kralevich [Sat, 19 Dec 2015 06:58:58 +0000 (06:58 +0000)]
Merge "common_time_server.cpp: more O_CLOEXEC"
Jae Seo [Sat, 19 Dec 2015 05:38:48 +0000 (14:38 +0900)]
Add a class Javadoc for MediaBrowser.MediaItem
Also fixed a typo in MediaBrowserService.
Bug:
26181781, Bug:
26182458
Change-Id: I1f672f8111a70ad9c16e9969d0fad0e504fefb8a
Nick Kralevich [Sat, 19 Dec 2015 04:47:02 +0000 (20:47 -0800)]
common_time_server.cpp: more O_CLOEXEC
Change-Id: I2185a462d72e11f5a015c525d2d37c52ecc3e430
Jeff Sharkey [Sat, 19 Dec 2015 02:19:02 +0000 (02:19 +0000)]
Merge "Point "unlocked" logic at lower level."
Jeff Sharkey [Sat, 19 Dec 2015 00:18:09 +0000 (17:18 -0700)]
Point "unlocked" logic at lower level.
There is a race when starting a non-encryption-aware launcher before
we've gone through the user lifecycle to enter the "running unlocked"
state. This can cause the launcher to choke when it's denied access
to widgets that are still considered locked.
For now, relax the notion of a user being unlocked to reflect the
on-disk state, instead of looking at the user lifecycle.
Also add logging of encryption commands.
Bug:
26267450
Change-Id: Ie330d07418cf10413e0b4380f6d6781684f01952
Dimitry Ivanov [Sat, 19 Dec 2015 00:49:08 +0000 (00:49 +0000)]
Merge "Use shared namespace for bundled app classloader"
Jun Mukai [Fri, 18 Dec 2015 23:30:10 +0000 (23:30 +0000)]
Merge "Introduce pointer capture API."
Filip Gruszczynski [Fri, 18 Dec 2015 23:29:58 +0000 (23:29 +0000)]
Merge "Temporarily disable forcing of drawing status bar background."
Filip Gruszczynski [Fri, 18 Dec 2015 22:19:35 +0000 (14:19 -0800)]
Temporarily disable forcing of drawing status bar background.
Forcing status bar background drawing causes all windows to be
considered fullscreen. As a result alert dialog windows have incorrect
containing frames and aren't repositioned when IME appears.
Until a better solution is implemented for forcing drawing the status
bar, we disable it to have correct old behavior.
Bug:
26050571
Bug:
24365214
Change-Id: Ic27a394711a587fa152a238699cd19751e91a732
Bryce Lee [Fri, 18 Dec 2015 23:25:27 +0000 (23:25 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385 am:
d980b8c7a0 am:
1b695edc97
am:
76656c6b48
* commit '
76656c6b48d3fa3e5538e864929ba63b692d5764':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:19:18 +0000 (23:19 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385 am:
d980b8c7a0
am:
1b695edc97
* commit '
1b695edc97c227a64ef810daee7dc9f3b35206a7':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:13:51 +0000 (23:13 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev am:
9c27969385
am:
d980b8c7a0
* commit '
d980b8c7a05a2dc51145c3465c14f1f106a8bc47':
Remove duplicate Bluetooth profiles.
Bryce Lee [Fri, 18 Dec 2015 23:07:49 +0000 (23:07 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
am:
9c27969385
* commit '
9c27969385d7a59a535ba3274c279ae96a155d49':
Remove duplicate Bluetooth profiles.
Ben Kwa [Fri, 18 Dec 2015 23:06:13 +0000 (23:06 +0000)]
Merge "Implement bucketed sorting in DocumentsUI."
Ben Kwa [Thu, 17 Dec 2015 03:42:08 +0000 (19:42 -0800)]
Implement bucketed sorting in DocumentsUI.
Change the sort code in the Model to bucket items into two separate
categories (folders and documents) and then sort the two buckets
separately.
Add code to the adapter to insert a visual break in the UI, between
folders and documents.
Change-Id: I759fedcef829aba9ad61554326489a9e62641cc7
Bryce Lee [Fri, 18 Dec 2015 23:02:40 +0000 (23:02 +0000)]
Merge "Remove duplicate Bluetooth profiles." into cw-e-dev
George Mount [Fri, 18 Dec 2015 22:32:58 +0000 (22:32 +0000)]
Merge "Fix problem where enter and space key do nothing on ListView."
Mihai Niță [Fri, 18 Dec 2015 21:55:32 +0000 (21:55 +0000)]
Merge "Adding a locale picker with two-step selection: language, then region."
Andreas Gampe [Fri, 18 Dec 2015 21:27:18 +0000 (21:27 +0000)]
Merge "Frameworks/base: Change android.util.Log multiline logging"
Mihai Nita [Wed, 16 Dec 2015 00:06:20 +0000 (16:06 -0800)]
Adding a locale picker with two-step selection: language, then region.
This is intended to replace the UI part of the LocalePicker, at
least for the main "Settings" application (under "Language & Input")
and for the "Setup Wizard".
The UI part in the old LocalePicker can be removed once all the
components that use it are migrated to the new one.
Bug:
25800339
Change-Id: I2f264cdb7b7fc586124dd58fad2c68060d5b7aa8
Pablo Ceballos [Fri, 30 Oct 2015 17:34:30 +0000 (10:34 -0700)]
Add GLES32 class and JNI
Change-Id: I05ff0c14a35f51c2015edbd762dc9e6fe43347b9
Julia Reynolds [Fri, 18 Dec 2015 21:09:45 +0000 (21:09 +0000)]
Merge "Differentiate between apps that use topics and those that don't."
Daniel Koulomzin [Fri, 18 Dec 2015 21:04:41 +0000 (21:04 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02 am:
898e330aae am:
94794af6be
am:
3f66df086a
* commit '
3f66df086a210bc0dec7a0bd86081f6f79b3a712':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Robert Greenwalt [Fri, 18 Dec 2015 21:02:54 +0000 (21:02 +0000)]
George Mount [Fri, 18 Dec 2015 21:00:46 +0000 (13:00 -0800)]
Fix problem where enter and space key do nothing on ListView.
Enter should select the currently focused item. It was doing
nothing.
Change-Id: I149ed72804234c1c1da4a7a9be8c9f405722d4ec
Mark Lu [Fri, 18 Dec 2015 21:00:42 +0000 (21:00 +0000)]
Fix system watchdog timeout when reading too many usage events. am:
8877120173 am:
370567d1f5
am:
8f968ae1a2
* commit '
8f968ae1a22f940f68ac2bf08c4ffcfde539e93b':
Fix system watchdog timeout when reading too many usage events.
Robert Greenwalt [Fri, 18 Dec 2015 20:59:02 +0000 (20:59 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dev am:
4557ef32fe am:
628b8f1f5f am:
a652b7161d am:
c99c41781c am:
b5f6115092
am:
740e5da062
* commit '
740e5da0624f8ede5a8ddaa20bfdbb2bd1cfa13a':
Check permissions on getDeviceId.
Julia Reynolds [Fri, 18 Dec 2015 14:04:34 +0000 (09:04 -0500)]
Differentiate between apps that use topics and those that don't.
Bug:
22451710
Change-Id: Idb567a4fc511a03cb999179765cfa4cbeb63dcb7
Robert Greenwalt [Fri, 18 Dec 2015 20:57:33 +0000 (20:57 +0000)]
Merge "Check permissions on getDeviceId." into mnc-dr-dev am:
ef58df63d6 am:
064eb2a7cc am:
5d7bb383b8 am:
50843b1708
am:
15912efe72
* commit '
15912efe72fe27d9ce212d203227687fe8d98867':
Check permissions on getDeviceId.
Daniel Koulomzin [Fri, 18 Dec 2015 20:15:10 +0000 (12:15 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02 am:
898e330aae
am:
94794af6be
* commit '
94794af6bee35c249857f0440c361d589b77aa5d':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Robert Greenwalt [Fri, 18 Dec 2015 20:09:54 +0000 (12:09 -0800)]
Daniel Koulomzin [Fri, 18 Dec 2015 20:09:35 +0000 (20:09 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev am:
cbef517d02
am:
898e330aae
* commit '
898e330aaedbfa9e41d649187800c307e3d84169':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Amith Yamasani [Fri, 18 Dec 2015 19:59:19 +0000 (19:59 +0000)]
Merge "Fix broken user removal"
Daniel Koulomzin [Fri, 18 Dec 2015 19:55:52 +0000 (11:55 -0800)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
am:
cbef517d02
* commit '
cbef517d02f4f3680e155cc1a704ebf5c959d03f':
Making ViewRootImpl drop input events when the Activity is in ambient mode.
Ruben Brunk [Fri, 18 Dec 2015 19:50:24 +0000 (19:50 +0000)]
Merge "Add a framework service tracking VR mode state."
Daniel Koulomzin [Fri, 18 Dec 2015 19:49:18 +0000 (19:49 +0000)]
Merge "Making ViewRootImpl drop input events when the Activity is in ambient mode." into cw-e-dev
Wale Ogunwale [Fri, 18 Dec 2015 19:47:13 +0000 (19:47 +0000)]
Merge "Added PRIVATE_FLAG_LAYOUT_CHILD_WINDOW_IN_PARENT_FRAME window flag"
Robert Greenwalt [Fri, 18 Dec 2015 19:42:58 +0000 (11:42 -0800)]
Robert Greenwalt [Fri, 18 Dec 2015 19:36:54 +0000 (19:36 +0000)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926 am:
3927089cce
am:
f1530bf3d7
* commit '
f1530bf3d72315256dd7a2c18ba383dc15445b54':
Protect some new broadcasts.
Bryce Lee [Fri, 18 Dec 2015 19:34:20 +0000 (11:34 -0800)]
Remove duplicate Bluetooth profiles.
Change-Id: I04fd867511713dd02ef249b113f7a46c69f22f98
Robert Greenwalt [Fri, 18 Dec 2015 19:31:54 +0000 (11:31 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5 am:
1e04dfb926
am:
3927089cce
* commit '
3927089cce9d43a0b517f53fd6a542f07cb0955b':
Protect some new broadcasts.
Robert Greenwalt [Fri, 18 Dec 2015 19:24:53 +0000 (11:24 -0800)]
resolve merge conflicts of
9887f2f50a to lmp-sprout-dev. am:
5a77651489 am:
5946a9b798 am:
2ecc918bd3 am:
81674b1ff5
am:
1e04dfb926
* commit '
1e04dfb926040a6fad073fca0835777123d155e7':
Protect some new broadcasts.
Amith Yamasani [Fri, 18 Dec 2015 19:21:31 +0000 (11:21 -0800)]
Fix broken user removal
Check target user instead of current user, when deciding if
user can be stopped.
Bug:
26207032
Change-Id: Ibf9cb827943f8fbf8fa3b96a9e04c96d11a36d0a