16529 Commits

Author SHA1 Message Date
Jinsuk Kim
53c4d55897 am f6028359: am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit 'f60283598751cbbdb65b2a59d2294e23bb4dfb99':
  Use build property for CEC device OSD name
2014-04-03 02:17:08 +00:00
Jinsuk Kim
f602835987 am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit 'f2fe3505dac16dfa990fbab56713abab6ba0bc54':
  Use build property for CEC device OSD name
2014-04-03 02:11:40 +00:00
Jinsuk Kim
64b1ad5a39 am c9cb9138: am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit 'c9cb91388b268608c8b7f588dca8417f2661f0ed':
  Maintain display power status for playback device
2014-04-03 01:44:24 +00:00
Christopher Tate
4a7000924a am a7d9b937: Merge "Refuse update of a system app if it changes its shared uid"
* commit 'a7d9b93756c8b1e61a721fe14d941ee7ab975513':
  Refuse update of a system app if it changes its shared uid
2014-04-03 01:44:20 +00:00
Jinsuk Kim
c9cb91388b am 4c963841: am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit '4c963841db60ed59fd59a6fba79f8e3e6ec7f349':
  Maintain display power status for playback device
2014-04-03 01:41:13 +00:00
Christopher Tate
a7d9b93756 Merge "Refuse update of a system app if it changes its shared uid" 2014-04-03 01:39:36 +00:00
Jinsuk Kim
f2fe3505da am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modular-dev
* commit '31518f745ffa5e832274c332ac957a065948fdaf':
  Use build property for CEC device OSD name
2014-04-03 00:39:23 +00:00
Christopher Tate
c935d1f111 Refuse update of a system app if it changes its shared uid
Bug 13657183

Change-Id: I6d8fb9c8810ca896d2d10e5a80a3c4a50c9e4fed
2014-04-02 17:00:04 -07:00
Jinsuk Kim
60b17cc094 Use build property for CEC device OSD name
Previously OSD name was based on device type. This CL makes it
independent of device type. CEC spec says "A device that implements
more than one type of CEC functionality should respond with the same
OSD name for each logical address. It is recommended that the name
refers to the complete physical product rather than the individual
CEC functionality".

Now the default name comes from system build property. I removed
setOsdName() from aidl for now since it won't be in use.

Change-Id: I3c9fb877fad4bc5efef56268d155a3f37a865fc2
2014-04-03 07:59:27 +09:00
Jinsuk Kim
4c963841db am b1dca162: Merge "Maintain display power status for playback device" into klp-modular-dev
* commit 'b1dca1624dc8d853a52d1918c7672173e9b79836':
  Maintain display power status for playback device
2014-04-02 22:43:52 +00:00
Jinsuk Kim
b1dca1624d Merge "Maintain display power status for playback device" into klp-modular-dev 2014-04-02 22:39:41 +00:00
Alan Viverette
3a3395042e am b325345e: Merge "Switch framework Holo references to Quantum.Light"
* commit 'b325345ef0adf2849350d339de1ec5f92b67b7ae':
  Switch framework Holo references to Quantum.Light
2014-04-02 22:18:59 +00:00
Alan Viverette
b325345ef0 Merge "Switch framework Holo references to Quantum.Light" 2014-04-02 22:15:16 +00:00
Jorim Jaggi
ae6ffcc3c7 Merge "Wait for Keyguard to be drawn after boot." into master-lockscreen-dev 2014-04-02 21:22:59 +00:00
Chris Wren
506fbbfa4c am af31a7d1: Merge "add variance to notification usage stats"
* commit 'af31a7d1cc26733f138119c43385aa86d0a3c04f':
  add variance to notification usage stats
2014-04-02 21:07:21 +00:00
Chris Wren
af31a7d1cc Merge "add variance to notification usage stats" 2014-04-02 21:03:00 +00:00
Chris Wren
5110397488 add variance to notification usage stats
Change-Id: I9b6abd08cf01a1d80c8e5dd581c8e82e019542fc
2014-04-02 16:57:56 -04:00
Jorim Jaggi
cff0acb6b1 Wait for Keyguard to be drawn after boot.
The old logic with waiting for the Keyguard to be drawn assumed that
it is in an own window, and just checked for the visibility. This is
no longer possible as the Keyguard is in the status bar, and the status
bar might have been drawn without the Keyguard. So we have to wait
explicitely until Keyguard told PhoneWindowManager that it has now been
drawn and we can turn on the screen.

In addition, the starting logic of SystemUI is moved into
SystemUIApplication such the we can make sure that the status bar
already exists when the callbacks from PhoneWindowManager reach
KeyguardService. This simplifies the logic a lot.

Bug: 13635952
Change-Id: Ifd6ba795647edcf3501641e39052e4d04bc826fb
2014-04-02 22:11:19 +02:00
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
Jinsuk Kim
4e90fcd190 Maintain display power status for playback device
With this CL, the power status of TV/display is keep tracked of
by hdmi cec server part, specfically HdmiCecDevicePlayback.
Turned the HdmiCecDevice to abstract class from which classes of
concrete device type(HdmiCecDevicePlayback, HdmiCecDeviceTV) are
inherited. The display power status code is put in HdmiCecDevicePlayback
only. HdmiCecDeviceTv will have its own logic that manages power status of
devices connected to it. For now it only has a bare minimum code.
Will be worked on in follow up CLs.

Other changes:

    - Replaced sendGiveDevicePowerStatus() with isTvOn() so that the status
      can be queried by clients.

    - Defensively check the availability of HdmiCecService so that
      HdmiCecManager.getClient() returns null in case the service couldn't
      be initialized. This ensures clients of the service gets the nulled-out
      HdmiCecClient when called in the state/configuration where the service
      is not available, thus proceed accordingly.

Change-Id: Idaf69e73cfbd639c0b40b1bd4b6146f011246180
2014-04-02 14:46:14 +09: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
Alan Viverette
6259933ec9 Switch framework Holo references to Quantum.Light
Change-Id: Ib545a143f1959b6104adbc9d594dd626851d90b3
2014-04-01 14:57:39 -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