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

15787 Commits

Author SHA1 Message Date
Jinsuk Kim
6003730220 am 8fe27e88: Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev 
* commit '8fe27e881851921a90882f7d4da142bf936c5549':
  Move logical address allocation logic into native service from HAL
 2014-04-29 21:35:01 +00:00
Jinsuk Kim
8fe27e8818 Merge "Move logical address allocation logic into native service from HAL" into klp-modular-dev 2014-04-29 21:32:50 +00:00
Adam Lesinski
734a78fb86 am 8ea2d451: Merge "Various CTS fixes" into klp-modular-dev 
* commit '8ea2d4512248ec612356f558ac35534c3e4c6db6':
  Various CTS fixes
 2014-04-28 20:33:09 +00:00
Adam Lesinski
8ea2d45122 Merge "Various CTS fixes" into klp-modular-dev 2014-04-28 20:30:35 +00:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Elliott Hughes
685a0a72d4 am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit 'bbd87eb9193e9730869171324ee4f5fc1abeae55':
  Track libcore.os' move to android.system.
 2014-04-28 18:17:06 +00:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Craig Mautner
cb48b96223 am 1a7e9e66: Merge "Throw exception from startActivity if not allowed." into klp-modular-dev 
* commit '1a7e9e66a6de039da8f567a2087d9bce34820746':
  Throw exception from startActivity if not allowed.
 2014-04-25 18:45:06 +00:00
Craig Mautner
247ab65a49 Throw exception from startActivity if not allowed. 
The ActivityView.startActivity method may defer calling
ActivityContainer.startActivity if the ActivityView is not yet
visible. If the activity being started doesn't have allowEmbedded
attribute set to true then the SecurityException will not be
thrown until the ActivityView is visible. In such a case the caller
of ActivityView.startActivity cannot catch the SecurityException.

This fix checks the attribute at the time ActivityView.startActivity
is called.

Fixes bug 14317210.

Change-Id: I7fff23e39b67a9a0aa1b2e555920d02ae38906d9
 2014-04-25 11:20:01 -07:00
Adam Lesinski
2c8d67c9b0 Various CTS fixes 
WallpaperManager should always do a null check on the service object.
SystemServer should always bring up the DevicePolicyManagerService,
and let the service do appropriate default no-ops if the feature
is not supported.

Change-Id: Iaaf12b60ed375fe2e341ec11faa10c9344d7d9da
 2014-04-25 11:07:39 -07:00
Craig Mautner
e5889679f6 am 3a656ea3: Merge "Too soon." into klp-modular-dev 
* commit '3a656ea32e6d6489f4bc45884e5acede9fe2de51':
  Too soon.
 2014-04-25 03:06:34 +00:00
Craig Mautner
3a656ea32e Merge "Too soon." into klp-modular-dev 2014-04-25 03:03:37 +00:00
Craig Mautner
2e46e65e9d Too soon. 
Change-Id: I1abb1d4841e4e6342c3b861d33ae22e22ed0a161
 2014-04-25 03:01:40 +00:00
Craig Mautner
fbb0796eb3 am 3359bbe0: Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 
* commit '3359bbe02ca645bae2f495df51e7b4001de6c2b1':
  Add test for attribute android:allowEmbedded
 2014-04-25 00:42:25 +00:00
Craig Mautner
3359bbe02c Merge "Add test for attribute android:allowEmbedded" into klp-modular-dev 2014-04-25 00:39:06 +00:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Elliott Hughes
5f5ca3bc98 am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '31a1dd2a8f56b439861ee335b55f44323318830c':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:55:09 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Michael Kolb
0fc5f86950 am e597d5f9: Merge "Use rotation to position circular display mask" into klp-modular-dev 
* commit 'e597d5f9310f760843272c728d6fb1917abf241a':
  Use rotation to position circular display mask
 2014-04-24 16:13:41 +00:00
Michael Kolb
e597d5f931 Merge "Use rotation to position circular display mask" into klp-modular-dev 2014-04-24 16:08:21 +00:00
Michael Kolb
8b275ca9d3 Use rotation to position circular display mask 
Bug: 14231785

Change-Id: Ib6d69f3b9c2a638731539f1c1e51b56ad1698adc
 2014-04-24 09:01:19 -07:00
Craig Mautner
75731016e9 Add test for attribute android:allowEmbedded 
Throw a SecurityException if it is not true for an activity launched
using ActivityContainer.startActivity().

Change-Id: Id1d70e630195a49a3eccdc64a0beccc420400332
 2014-04-24 08:42:32 -07:00
Craig Mautner
7e28afd956 am 7d2d2272: Merge "Force ActivityView activities to start in new task" into klp-modular-dev 
* commit '7d2d2272f1dc91f27983797349f8253bfa25e8b4':
  Force ActivityView activities to start in new task
 2014-04-24 09:11:30 +00:00
Craig Mautner
7f7bdb2712 Force ActivityView activities to start in new task 
Activities were associating with existing tasks when their
components matched. This was causing them to be launched
into existing stacks rather than into their ActivityView. Adding
these flags forces the launches to be in unique tasks on their
ActivityView.

Fixes bug 14252286.

Change-Id: I9ba65a4a2da198435748c0a17396d3f7f8c75f5e
 2014-04-23 13:55:36 -07:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
 2014-04-23 16:48:34 +00:00
Neil Fuller
caf6497b9a am 683cf1bf: Merge "Changes to support asynchronous close interruption" 
* commit '683cf1bffe33f49f26d46201f96cd2eff60e8192':
  Changes to support asynchronous close interruption
 2014-04-23 16:45:15 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption 
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
 2014-04-23 16:40:35 +00:00
Jeff Brown
62271b9522 am 3af39267: Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 
* commit '3af392674969b17cd3719f49ae597c7dc6ee6614':
  Fix HDMI hotplug display blanking behavior.
 2014-04-23 01:22:26 +00:00
Jeff Brown
3af3926749 Merge "Fix HDMI hotplug display blanking behavior." into klp-modular-dev 2014-04-23 01:20:01 +00:00
Jeff Brown
44b1f76474 Fix HDMI hotplug display blanking behavior. 
Bug: 14109146
Change-Id: Ie7de4fb05da210e8c74c795f7896cf9951701aeb
 2014-04-22 18:07:24 -07:00
Ying Wang
d12bf27575 am d0dc8981: Merge "Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name" into klp-modular-dev 
* commit 'd0dc898119fc43de89ff41e39d37961dacab4eaa':
  Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name
 2014-04-23 00:11:52 +00:00
Ying Wang
b081a59a0f Javac (at least for 1.7.0_51 on Mac) wants fully qualified class name 
It looks like a Javac bug.

Bug: 14255510
Change-Id: Id3899994226049ff77854fd2a13a6d1b687a0392
 2014-04-22 15:20:16 -07:00
Nick Kralevich
9a492393df am 5246f459: am d267c1a0: Merge "remove unneeded import statements." 
* commit '5246f4599a0c9978012ffb1049307704b5027a0b':
  remove unneeded import statements.
 2014-04-22 21:15:10 +00:00
Nick Kralevich
d236d625b4 am 3ab7882a: am a67d4a6e: Merge "remove unused import." 
* commit '3ab7882a57d3c7a0e13f58837cd02138df43f301':
  remove unused import.
 2014-04-22 21:14:59 +00:00
Nick Kralevich
5246f4599a am d267c1a0: Merge "remove unneeded import statements." 
* commit 'd267c1a06fc91dc300d5c5f8b7ef9bd44825c34e':
  remove unneeded import statements.
 2014-04-22 19:52:21 +00:00
Nick Kralevich
3ab7882a57 am a67d4a6e: Merge "remove unused import." 
* commit 'a67d4a6e4da1eb02a15a1048a26329cfed312938':
  remove unused import.
 2014-04-22 19:52:18 +00:00
Nick Kralevich
d267c1a06f Merge "remove unneeded import statements." 2014-04-22 19:24:47 +00:00
Nick Kralevich
c826257bf3 remove unneeded import statements. 
Internal master is out of sync with AOSP. Resync.

Change-Id: Ia3105a4b6eb835f719471a26ae4cb33962c5b19e
 2014-04-22 12:17:51 -07:00
Nick Kralevich
8cb5abcfde remove unused import. 
This change resynchronizes AOSP with internal master.
The import line is unused.

Change-Id: I98bef1f88dee758f5bdcec35fba204f793d4028e
 2014-04-22 12:10:24 -07:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView 
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
 2014-04-22 13:27:53 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle 
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
 2014-04-22 13:27:44 +00:00
Craig Mautner
6985badc63 Fix black ActivityView 
Don't add the surface to the VirtualDisplay until the activity
has drawn. That will keep the TextureView from turning black.

Fixes bug 12821632.

Change-Id: Ia06e9f91be3e14ad724f735ae4e201ac798863a2
 2014-04-21 15:28:43 -07:00
Craig Mautner
f4c909bcb8 Fix ActivityView lifecycle 
Major changes to maintain the VirtualDisplay across repeated
attach/detach cycles of an ActivityView. This keeps the activities
and VirtualDisplays in the ActivityView from getting into bad states.

Fixes bug 14107002.

Change-Id: Idc2aaf85ac496eab0eeb436736cb10a2020040e8
 2014-04-21 15:28:42 -07:00
Jinsuk Kim
cbafd1b3ea Move logical address allocation logic into native service from HAL 
Logical address logic is independent from hardware, and the algorithm is
standardized in the spec. Moved the logic to service so that all HAL
implementations doesn't have to duplicated logic inside.

Related change in HAL definition is in:
https://googleplex-android-review.git.corp.google.com/#/c/447951/

Change-Id: I9699309719f3214fc2dbdf219faad484c0c1c5bf
 2014-04-21 07:42:35 +09:00
Jeff Brown
18a69b936a am 8e1e4006: Merge "Add support for dynamically setting the virtual display surface." into klp-modular-dev 
* commit '8e1e40066bae030d6a6e8f3f3f8f69ccd6ec1848':
  Add support for dynamically setting the virtual display surface.
 2014-04-17 21:53:34 +00:00
Jeff Brown
92207df753 Add support for dynamically setting the virtual display surface. 
Previously, the surface that backs a virtual display had to be set
at the time when the display was created.  This change now makes
it possible to set or remove the surface later.  The virtual display
is treated as if it were "off" while no surface is attached to it.

Change-Id: Ib4fdbbb8b4ee79f0fb9ceb648f9bda4a8fa6a2ca
 2014-04-16 18:45:05 -07:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 
* commit '4980996bcc4e8065cf5dff1cf989d73face38281':
  Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
 2014-04-16 23:49:20 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Aaron Whyte
d1931ffc07 Allowed custom secure-adb confirmation via Activity or Service. 
It used to only be available via an Activity.

Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
 2014-04-16 14:50:14 -07:00
Craig Mautner
4b81e89d9b am 2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev 
* commit '2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
  Fix ActivityContainer callback parcelling.
 2014-04-16 20:10:26 +00:00