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

16509 Commits

Author SHA1 Message Date
Kenny Guy
501f2c2cf0 am f4824a06: Fix issue with not allowing activities for current user. 
* commit 'f4824a06884e096beef921646cba4be29d7f36fc':
  Fix issue with not allowing activities for current user.
 2014-04-02 18:28:35 +00:00
Kenny Guy
f4824a0688 Fix issue with not allowing activities for current user. 
Change-Id: Ic2e30c3f4990a03aac9801ee9bf5f270a5e90ef8
 2014-04-02 19:17:41 +01:00
Kenny Guy
ffa80df578 am 1ccace91: Merge "Rename related users to profiles." 
* commit '1ccace916c8fdc61f1a8db6677aed518d31647e6':
  Rename related users to profiles.
 2014-04-02 13:10:07 +00:00
Kenny Guy
1ccace916c Merge "Rename related users to profiles." 2014-04-02 13:06:28 +00:00
Kenny Guy
2a764949c9 Rename related users to profiles. 
Rename the related user concept as profiles.
When returning profiles of a user include the
user as a profile of itself.

Change-Id: Id5d4f29017b7ca6844632ce643f10331ad733e1d
 2014-04-02 13:44:50 +01:00
Narayan Kamath
b07178467f am b69bb445: resolved conflicts for merge of 71ab4f4f to master 
* commit 'b69bb445585a083b8e4ff8a13a1a1a63e9c22a6a':
  Move zygote startup logic to the frameworks.
 2014-04-02 10:59:18 +00:00
Narayan Kamath
b69bb44558 resolved conflicts for merge of 71ab4f4f to master 
Change-Id: I888c231f7579523e12fbd68f820f0775019e51e0
 2014-04-02 11:52:07 +01:00
Narayan Kamath
71ab4f4f48 am ea9e5eca: am 17b1b8fe: Merge "Move zygote startup logic to the frameworks." 
* commit 'ea9e5ecac1e5240370f0e3f998b9c8b159ee9320':
  Move zygote startup logic to the frameworks.
 2014-04-02 10:41:24 +00:00
Narayan Kamath
ea9e5ecac1 am 17b1b8fe: Merge "Move zygote startup logic to the frameworks." 
* commit '17b1b8fe8c0c8f05f2077acc82428881bf591a78':
  Move zygote startup logic to the frameworks.
 2014-04-02 10:35:38 +00:00
Narayan Kamath
973b4663b0 Move zygote startup logic to the frameworks. 
The Zygote class is now in com.android.internal.os. It is
responsible for the vast majority of work before and after
the call to fork(). It calls back into the Runtime via
the new dalvik.system.ZygoteHooks class to allow the Runtime
to perform pre fork cleanup and post fork initialization.

The native code in Zygote.cpp is a direct and straightforward
port of the existing code in art. Most differences are
superficial, for example :
- We use C style logging (ALOGE) instead of stream based
  logging.
- We call env->FatalError() instead of using LOG(FATAL)

Change-Id: Ia101fb2af12d23894fe57e4134d2bc6d142e5059
 2014-04-02 10:18:43 +01:00
Michael Kolb
5e9abc9507 am 118d252e: am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev 
* commit '118d252e7541bfe2c0453814acc3bee0b6312de1':
  Add circular anti-aliasing mask to circular display
 2014-04-02 00:07:48 +00:00
Michael Kolb
118d252e75 am 4a812147: am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev 
* commit '4a8121478e5027bf61b5c711d6b1a748004edea2':
  Add circular anti-aliasing mask to circular display
 2014-04-02 00:03:29 +00:00
Christopher Tate
733581b035 am a2dbe4e3: Merge "Rejigger the invalid-key checks at backup time" 
* commit 'a2dbe4e3cd3d9d52cda3e798bf9405ff8a780250':
  Rejigger the invalid-key checks at backup time
 2014-04-01 23:50:55 +00:00
Christopher Tate
cba5941c60 Rejigger the invalid-key checks at backup time 
Bug 13732002

Change-Id: Ic8f71234d1bbc7420eaa8e1762b999d09f308d46
 2014-04-01 16:43:00 -07:00
Michael Kolb
4a8121478e am 875eff83: Merge "Add circular anti-aliasing mask to circular display" into klp-modular-dev 
* commit '875eff832f9f496740ceba2f12de6f5423225274':
  Add circular anti-aliasing mask to circular display
 2014-04-01 22:54:30 +00:00
Michael Kolb
39a6db7cd5 Add circular anti-aliasing mask to circular display 
Bug: 13635645

  Add a 2 px wide anti-aliased circle as a Layer to WindowManagerService

Change-Id: Ic8d319ca43c222f5b2e69af896749b8f2018ce3e
 2014-04-01 15:28:01 -07:00
Christopher Tate
9d51192e56 am f74aa094: Handle bad package name arguments sensically 
* commit 'f74aa094b413f113f7dd8cef0ce28fb933a27a5d':
  Handle bad package name arguments sensically
 2014-04-01 18:10:52 +00:00
Christopher Tate
f74aa094b4 Handle bad package name arguments sensically 
Don't blithly go ahead and assume package name arguments are non-null,
and don't continue to do a bunch of work after an early failure on
invalid non-null package names.

Bug 13745101

Change-Id: I12ccae343066b39162dedeb46dc58869f55be0ba
 2014-04-01 10:54:39 -07:00
Paul McLean
8640be258a am 6f127c9b: Merge "Initial implementation of USB Audio output." 
* commit '6f127c9b6c249ca1cd17c07a8476edd0fcc1f04d':
  Initial implementation of USB Audio output.
 2014-04-01 16:17:13 +00:00
Paul McLean
6f127c9b6c Merge "Initial implementation of USB Audio output." 2014-04-01 16:15:47 +00:00
Paul Lawrence
d2cf756996 am df42723d: Merge "Don\'t double prompt on booting encrypted device" 
* commit 'df42723d6b717fd2882c98c930a0f93c75af2474':
  Don't double prompt on booting encrypted device
 2014-04-01 15:12:17 +00:00
Paul Lawrence
df42723d6b Merge "Don't double prompt on booting encrypted device" 2014-04-01 15:07:10 +00:00
Paul McLean
3af0fe0c9d Initial implementation of USB Audio output. 
Change-Id: I7fbbe421285d628fa49591c6469ac50efec77ccf
 2014-03-31 16:41:33 -07:00
Nick Kralevich
b4b159d255 am 0e290b77: am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '0e290b7708e2ac59e645f499d8348a3a087a9568':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:32:13 +00:00
Nick Kralevich
0e290b7708 am ce30fca8: am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'ce30fca85deec8e268009a2acaefe85541ab1e58':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:26:27 +00:00
Nick Kralevich
ce30fca85d am e531e2ec: am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit 'e531e2ec6b311c35b077cc228e832b3f1530dffa':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:20:41 +00:00
Nick Kralevich
e531e2ec6b am 3b2a9d22: Merge "Change when the SELinux relabel of /data/data occurs." 
* commit '3b2a9d22794cb9f1c2a28884b5c3ba92ecc6ff96':
  Change when the SELinux relabel of /data/data occurs.
 2014-03-31 20:14:37 +00:00
Nick Kralevich
3b2a9d2279 Merge "Change when the SELinux relabel of /data/data occurs." 2014-03-31 20:09:31 +00:00
Adrian Roos
e6978cda71 am 53ab5174: Merge "Define trust agent framework components" 
* commit '53ab5174d5009786dc58da3011181b77e325c130':
  Define trust agent framework components
 2014-03-31 19:26:11 +00:00
Adrian Roos
82142c21dd Define trust agent framework components 
Adds the TrustManager system service that allows
registering for changes to the trust status and
reporting events that are important to trust agents.

Bug: 13723878
Change-Id: I7d0d2ea86fd755702d31aa5d49cac038a6cd4301
 2014-03-31 21:18:28 +02:00
Narayan Kamath
e402774407 am 439cf5b4: am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '439cf5b433123970a94388cf9309d9ea4d31b3cb':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:21:38 +00:00
Narayan Kamath
439cf5b433 am 56a8f8b4: resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
* commit '56a8f8b48ff1d0855209307b9076d6e9b348b59b':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 13:16:16 +00:00
Narayan Kamath
56a8f8b48f resolved conflicts for merge of 439145f0 to klp-modular-dev-plus-aosp 
This isn't a straightforward conflict resolution. This code
has changed significantly. mSafeMode is now a flag on the activity
manager service, and is set when SystemServer calls enterSafeMode.

Change-Id: I1e8ff524566c5e44bb6bf3b138cdebb70004aca3
 2014-03-31 14:10:53 +01:00
Christoph Studer
085226c40f am 546bec8e: Notification usage stats 
* commit '546bec8ebf2cf865e88d02cc8cb29563ad224967':
  Notification usage stats
 2014-03-31 12:45:33 +00:00
Narayan Kamath
439145f0e7 am ab561f5b: Merge "Don\'t make isSafeMode a field on the Zygote class." 
* commit 'ab561f5b4073055c414866ff3dbe8372263474a7':
  Don't make isSafeMode a field on the Zygote class.
 2014-03-31 12:42:14 +00:00
Narayan Kamath
d1a8d9f452 Don't make isSafeMode a field on the Zygote class. 
This field is written and read exclusively by the system server,
and should therefore belong to the SystemServer class.

Change-Id: I2708a9a45c0c9cd1a6f563e8cc5844bd8c424bf7
 2014-03-31 13:16:45 +01:00
Jorim Jaggi
bd490ad59f Merge "Make Keyguard a library and make StatusBar the new Keyguard." into master-lockscreen-dev 2014-03-31 12:05:54 +00:00
Christoph Studer
546bec8ebf Notification usage stats 
First cut of gathering implicit notification signals and computing
running stats.

Tracks:
1. Post, update, remove by apps
2. Click, dismissal by users

Stats are aggregated on user, user+pkg, and getKey() levels.

Current stats are printed as part of 'dumpsys notification'.

Change-Id: I06ecbf76e517509895f2f9eea5b9d19bf9a34975
 2014-03-31 12:50:13 +02:00
Jinsuk Kim
00bc283453 am 2e59bd78: am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '2e59bd788546e29e48b85bda72da6af61704113d':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:50:56 +00:00
Jinsuk Kim
2e59bd7885 am 41eaa32c: Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 
* commit '41eaa32c100d8a903daa7b7d09d34887a3e45ffd':
  Replace individual methods with a consolidated CEC nativeSendmessage
 2014-03-31 01:44:51 +00:00
Jinsuk Kim
41eaa32c10 Merge "Replace individual methods with a consolidated CEC nativeSendmessage" into klp-modular-dev 2014-03-31 01:40:30 +00:00
Craig Mautner
71888f54cb am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit '1872ce3e7af0e2130a9e8f9f52983cd234f6ead0':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 23:40:33 +00:00
Adam Hampson
6f9bddc846 am e8609de4: am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit 'e8609de4fb3635ab7182283e94ac56b48c07463a':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:40:23 +00:00
Aaron Whyte
868f373b65 am 23fd13de: am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public k 
* commit '23fd13de62762e98c32f2b7525f01f0bcdf416fd':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:40:13 +00:00
Craig Mautner
1872ce3e7a am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off." 
* commit '155e3133407e590f18e7e16eddc6fc743f35b0fd':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
 2014-03-28 23:05:42 +00:00
Adam Hampson
e8609de4fb am 594c73fc: Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 
* commit '594c73fc57c99a0bceaa84ccd7524e5038a17ad8':
  hdmi: cec: add permission name to dump permission denial message
 2014-03-28 23:04:01 +00:00
Aaron Whyte
23fd13de62 am f10d0399: Made secure-adb\'s new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys. 
* commit 'f10d0399bf5f519dff414a9d195a0eaacb37f9b7':
  Made secure-adb's new-public-key activity configurable. Some devices do not have lockscreens themselves, so the plan is to have them do RPCs to companion devices that can have lockscreens, for allowing or rejecting unwhitelisted adb public keys.
 2014-03-28 23:03:56 +00:00
Yuhao Zheng
93627ac86c Merge "Wifi hotspot stack initial hook up" 2014-03-28 22:49:51 +00:00
Adam Hampson
594c73fc57 Merge "hdmi: cec: add permission name to dump permission denial message" into klp-modular-dev 2014-03-28 22:22:52 +00:00
Aaron Whyte
f10d0399bf Made secure-adb's new-public-key activity configurable. 
Some devices do not have lockscreens themselves, so the plan is to have them
do RPCs to companion devices that can have lockscreens, for allowing or
rejecting unwhitelisted adb public keys.

Change-Id: I6f7504313074e6748c0bd467a29ac3a311036f4d
 2014-03-28 22:21:55 +00:00