drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
228,365 Commits 1 Branch 0 Tags
Commit Graph

228365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
33e9b426da Merge "Fix merged op clipping issue" 2015-12-18 18:07:50 +00:00
Chris Craik
93e53e09dd Fix merged op clipping issue 
Change-Id: I48cd5e92f3e62dcd189a4411a71aa7a40ce5498c
 2015-12-18 10:07:16 -08:00
Daniel Koulomzin
087ae471c2 Making ViewRootImpl drop input events when the Activity is in ambient 
mode.

WearableActivityController tells ViewRootImpl about ambient mode.

Bug: 25912259
Bug: 25973146
Bug: 25714113
Change-Id: Idcca2b254db3145039f50f2a7dfd38a224ec287e
 2015-12-18 12:56:00 -05:00
Fyodor Kupolov
7164cb68dd Merge "Use buffering when reading preferred apps" 2015-12-18 17:22:07 +00:00
Fyodor Kupolov
42f9fe75e6 Merge "Optimized database creation for a new user" 2015-12-18 17:22:04 +00:00
Filip Gruszczynski
07a0e4980b Collect activity starting logic into ActivityStarter class. 
Change-Id: If1c074d6c278647ec55f2313483945f24aca8b3b
 2015-12-18 09:04:55 -08:00
Wale Ogunwale
ef19b98312 Merge "Correctly set mContainingFrame for PopupWindows in multi-window mode" 2015-12-18 16:44:15 +00:00
Jeff Sharkey
2527e2bf15 Merge "Allow library spec and app configs to be read from odm partition" 2015-12-18 16:34:26 +00:00
Wale Ogunwale
79f268d92a Correctly set mContainingFrame for PopupWindows in multi-window mode 
For child windows we want to base their containing frame on their
parent frame and not the task bounds.

Bug: 26255254
Change-Id: Ic211c31e69df16fdbdb7b7ba2022379c5f4a87c0
 2015-12-18 08:25:47 -08:00
George Mount
69b495bdb8 Merge "Alt-up moves focus to the toolbar in action bar mode." 2015-12-18 15:46:31 +00:00
George Mount
5beb2617f9 Alt-up moves focus to the toolbar in action bar mode. 
Bug 24811572

Change-Id: Ie065fa13ba76131e700e73984a99fc60a7aa513c
 2015-12-18 07:44:50 -08:00
George Mount
7f55215afd Merge "Reset accessibility after Activity enter transition." 2015-12-18 15:29:52 +00:00
Todd Kennedy
c366471590 Merge "Print "Success" on success" 2015-12-18 15:16:19 +00:00
Winson Chung
0583d3d188 Hiding pinned stack tasks from overview 
Bug: 25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3
 2015-12-18 10:05:13 -05:00
Daichi Hirono
87af9a03f1 Merge "Show MTP device as root when it has multiple/zero storages." 2015-12-18 05:33:38 +00:00
Daichi Hirono
81d48536ae Show MTP device as root when it has multiple/zero storages. 
The CL updates MtpDocumentsProvider#queryRoots so that it fetches
devices from Database as well as storages when we don't have storages
under the device, or when we have multiple storages under the device.

BUG=26120019
Change-Id: Id2b140f00a1d49fa4da7e17d2564dbbaa1795e1e
 2015-12-18 14:12:35 +09:00
Robert Greenwalt
5a77651489 resolve merge conflicts of 9887f2f50a to lmp-sprout-dev. 
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
 2015-12-17 19:32:43 -08:00
Wale Ogunwale
ad1f8e69e8 Merge "Fixed some issues with tasks with the same affinity in different stacks" 2015-12-18 03:17:57 +00:00
Bryce Lee
bd17928afc resolve merge conflicts of 6b9e5bf0c2 to master. 
Change-Id: Idada49313619533bfeb375ee232c942589457fa4
 2015-12-18 03:05:20 +00:00
Andreas Gampe
8413db8c36 Frameworks/base: Change android.util.Log multiline logging 
To avoid long stacktraces being truncated, add code to split up
large chunks along line breaks.

Introduce LineBreakBufferedWriter to chunk up log output. Add a
core test for it.

Change-Id: I34160fbce853c21329f7fa109a9c42506b2066af
 2015-12-17 19:00:29 -08:00
Tomasz Mikolajewski
be4904962e Merge "Cleanup StubProvider a little." 2015-12-18 02:41:30 +00:00
Tomasz Mikolajewski
c7ec678d7c Cleanup StubProvider a little. 
Change-Id: I1d9f1c978850f466ff204bff97a152ba7919a096
 2015-12-18 11:29:48 +09:00
Ying Wang
43d39a12f1 Merge "Fix typo in config.xml file" am: 738a557d54 
am: 84d1b18b7b

* commit '84d1b18b7be03f1e15b61adcb543d1a47dec5952':
  Fix typo in config.xml file
 2015-12-18 01:50:38 +00:00
Wale Ogunwale
3938197097 Fixed some issues with tasks with the same affinity in different stacks 
- It is possible for tasks in different stacks to have the same root
affinity. This can be an issue when we are looking for the best task to
launch an acitivty into since there can be a better match in a different
stack based on class name. We now save the task matched by root afinity
and try to find a better match by class name. If we don't find a better
match we use the match based on root affinity.
- For pinned stack we don't allow root affinity matching as no other
task should be launching in the stack based on affinity.
- Correct ASS#moveActivityToStackLocked to use the passed in stack id
instead of the PINNED_STACK_ID.

Bug: 26015860
Change-Id: I6ec44bc97bf3c669c2305a58563518cf9bfc7804
 2015-12-17 17:31:27 -08:00
Mark Lu
370567d1f5 Fix system watchdog timeout when reading too many usage events. 
am: 8877120173

* commit '8877120173fd62d6701822471f06fe84e992c2ae':
  Fix system watchdog timeout when reading too many usage events.
 2015-12-17 16:18:45 -08:00
Adrian Roos
365458c678 Merge "Fix NPE in processForRemoteInput" 2015-12-18 00:03:59 +00:00
Mark Lu
8877120173 Fix system watchdog timeout when reading too many usage events. 
Symptom:
As issue link:
https://code.google.com/p/android/issues/detail?id=193100

RootCause:
UsageStatsService.onDisplayChanged executed in system main thread,
If calling UsageStatsManager.queryEvents with too many events before it
(i.e. in daily usage event file,
too many activity resume / pause events or configuration change
during monkey test),
System will be blocked then watchdog timeout.

Solution:
Let display listener executed in background thread handler

BUG: 25355086

Change-Id: Ic894d112612400ed8fb7ba843b3309fdc4f66fe1
(Cherrypicked from 4e59db328d8b0cc163d2e3eb0f7f3a108f20a58d)
(cherry picked from commit 7018f60b06fd0c647ebf13225320d7e15d02e075)
 2015-12-18 00:03:16 +00:00
Chris Craik
a2a70723b8 Simplify ClipArea to prefer Rect args 
Change-Id: I8af83d01dc5dd8009a0cd235dd8b59dab61d8560
 2015-12-17 23:31:44 +00:00
Chris Craik
2b17db773e Merge "Correct drawLines annotations" 2015-12-17 23:31:30 +00:00
Robert Greenwalt
b5f6115092 Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f am: a652b7161d 
am: c99c41781c

* commit 'c99c41781c69d2cfef411c531cf879e84ca62a74':
  Check permissions on getDeviceId.
 2015-12-17 15:15:09 -08:00
Robert Greenwalt
50843b1708 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 am: 064eb2a7cc 
am: 5d7bb383b8

* commit '5d7bb383b85aeaa60abeb6e3ad7ba854d6c40b37':
  Check permissions on getDeviceId.
 2015-12-17 15:13:36 -08:00
Chris Craik
92c11864c7 Correct drawLines annotations 
Change-Id: I161e419a3ce427e10d802ba692679ad671e23dde
 2015-12-17 15:11:24 -08:00
Robert Greenwalt
c99c41781c Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe am: 628b8f1f5f 
am: a652b7161d

* commit 'a652b7161d3069ba9b5650f1caf741d2588de141':
  Check permissions on getDeviceId.
 2015-12-17 23:09:11 +00:00
Robert Greenwalt
5d7bb383b8 Merge "Check permissions on getDeviceId." into mnc-dr-dev am: ef58df63d6 
am: 064eb2a7cc

* commit '064eb2a7cc8b811671682018b82c2b63064971ef':
  Check permissions on getDeviceId.
 2015-12-17 23:07:22 +00:00
Jeff Sharkey
bb0bed1f55 Merge "Send LOCKED_BOOT_COMPLETED to background apps." 2015-12-17 23:04:54 +00:00
Robert Greenwalt
a652b7161d Merge "Check permissions on getDeviceId." into mnc-dev am: 4557ef32fe 
am: 628b8f1f5f

* commit '628b8f1f5f6d249e2f222602352d14c40d648d97':
  Check permissions on getDeviceId.
 2015-12-17 23:04:24 +00:00
Jeff Sharkey
fc82a8c4bb Merge "Make printing framework encryption-aware." 2015-12-17 23:04:18 +00:00
Robert Greenwalt
064eb2a7cc Merge "Check permissions on getDeviceId." into mnc-dr-dev 
am: ef58df63d6

* commit 'ef58df63d6ba9d56620b6a440f15d0e07c842a44':
  Check permissions on getDeviceId.
 2015-12-17 23:01:33 +00:00
Robert Greenwalt
628b8f1f5f Merge "Check permissions on getDeviceId." into mnc-dev 
am: 4557ef32fe

* commit '4557ef32fe36b6f7ef7918052400d18af51d452f':
  Check permissions on getDeviceId.
 2015-12-17 22:58:14 +00:00
Robert Greenwalt
ef58df63d6 Merge "Check permissions on getDeviceId." into mnc-dr-dev 2015-12-17 22:52:58 +00:00
Robert Greenwalt
39d7334b09 Merge "Check permissions on getDeviceId." 2015-12-17 22:52:57 +00:00
Robert Greenwalt
4557ef32fe Merge "Check permissions on getDeviceId." into mnc-dev 2015-12-17 22:52:56 +00:00
Todd Kennedy
50ea35f669 Print "Success" on success 
Change-Id: I274e2aa5d840fee4f57f5a4f2f73af01f0587847
 2015-12-17 14:46:39 -08:00
Jeff Sharkey
a242f825e6 Send LOCKED_BOOT_COMPLETED to background apps. 
This mirrors how we're treating the normal BOOT_COMPLETED broadcast.

Bug: 26151835
Change-Id: Ibe1df0df8b89aafbe9af073e14fdd428710a6a40
 2015-12-17 15:38:20 -07:00
Winson Chung
2a43922df9 Merge changes Iac20cc7b,I87ce6320 
* changes:
  Fixing potential issue with wrong task descriptions being loaded.
  Refactoring to AnimatedEvent.
 2015-12-17 22:33:54 +00:00
Winson Chung
296278a067 Fixing potential issue with wrong task descriptions being loaded. 
- Also cleaning up the Task to remove some confusing nomenclature
  related to task properties.  Now there is a single icon and title,
  and we keep a copy of the TaskDescription for future icon loading.
- Also changing a few cases where we should be calling isFreeformTask()

Bug: 26221779
Change-Id: Iac20cc7b4912f76c14232a323981ab2e8f62628a
 2015-12-17 17:29:40 -05:00
Michael Wright
9943e0978f Merge "Start at the end of the IME dialog list, not one past." 2015-12-17 22:27:35 +00:00
Michael Wright
6db8e69afa Start at the end of the IME dialog list, not one past. 
Bug: 26240994
Change-Id: Ibc20474930d8c796edb3a5d4b75571a045f0a8dd
 2015-12-17 17:19:46 -05:00
Adrian Roos
a3539cb032 Fix NPE in processForRemoteInput 
Bug: 26168336
Change-Id: I010fb22caee2edd85cc0263abeb729e6b952ed01
 2015-12-17 22:18:11 +00:00
Fyodor Kupolov
b35b34c761 Use buffering when reading preferred apps 
On my test, a buffered version takes 10ms in contrast to 80 ms.

Bug: 26237300
Change-Id: I91ae05798672d243873e7447261156d5ebf3b045
 2015-12-17 14:16:51 -08:00