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

24227 Commits

Author SHA1 Message Date
Dianne Hackborn
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:15:10 +00:00
Dianne Hackborn
24bc8d761a am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android 
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
 2015-01-05 14:40:24 -08:00
Wale Ogunwale
62fbd4feb1 am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
automerge: b8e5139

* commit 'b8e51390af6015c1eaff7679546a5a7d2dfa701d':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:14:47 +00:00
Wale Ogunwale
b8e51390af am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '170a678cd2b7073edd061765dabd4a754f562e60':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:12:28 +00:00
Wale Ogunwale
170a678cd2 am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '1d893785bdd8af210eab861653e3e7664c728897':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:06:43 +00:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Sungsoo Lim
64a5234a3a am 269aad53: am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit '269aad530493ccdd7ec78c1704eebd4476348b5d':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:36:57 +00:00
Sungsoo Lim
269aad5304 am b65ad80d: Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 
* commit 'b65ad80de116f42fb3f2821363d52ce71e553517':
  DO NOT MERGE Make mute/unmute work
 2015-01-05 04:29:23 +00:00
Sungsoo Lim
b65ad80de1 Merge "DO NOT MERGE Make mute/unmute work" into lmp-mr1-dev 2015-01-05 04:25:12 +00:00
Sungsoo Lim
48248c80e5 DO NOT MERGE Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
(cherry picked from commit d1851e6e4e49b6a45d9e013de2e1384711975328)
 2015-01-05 11:50:49 +09:00
Dongwon Kang
871a962b79 am e9a205ce: am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit 'e9a205cec4001faab38a1fdba88b29125bfe37d1':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:42:06 +00:00
Dongwon Kang
e9a205cec4 am 017bb852: DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
* commit '017bb8523dd7c3dbfd00c055fde241de4dca9da2':
  DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager.
 2015-01-05 02:26:15 +00:00
Dongwon Kang
017bb8523d DO NOT MERGE TIF: Add a null checking in TvInputHardwareManager. 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
(cherry picked from commit b61077357eb6d8b95b303ef107b15db243a9621b)
 2015-01-05 02:12:44 +00:00
Dongwon Kang
766dc9e6ab Merge "TIF: Add a null checking in TvInputHardwareManager." 2015-01-05 01:20:43 +00:00
Sungsoo Lim
9dcba434e2 Fix typo 
Change-Id: I0c738602616fda510b765e03f8a25abfc8316b84
 2015-01-05 09:13:20 +09:00
Jinsuk Kim
65e644b449 am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
automerge: e82e47e

* commit 'e82e47e9cb01a19e88a89f8a43a7a15540b96869':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:27:36 +00:00
Jinsuk Kim
e82e47e9cb am 270686b6: am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit '270686b681e74622a09bb3081b1e03c55f692c3f':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:25:40 +00:00
Jinsuk Kim
270686b681 am ad1e3d7d: CEC: Buffer <Set System Audio Mode> 
* commit 'ad1e3d7df42376cd2a257b6c3b2fed540658a6e3':
  CEC: Buffer <Set System Audio Mode>
 2015-01-03 21:20:30 +00:00
Jinsuk Kim
ad1e3d7df4 CEC: Buffer <Set System Audio Mode> 
<Set System Audio Mode> is another command that needs to be buffered
in case the command arrives before the system is ready to process it.
When processed, system audio mode will be enabled based on the
global setting.

Bug: 18809965

Change-Id: Ia6ebc4e2919e1b94498ca28f652c6db95f907f9c
 2015-01-02 16:08:56 +09:00
Robin Lee
290e91107c Remove deprecated upgrade path for relatedGroupId 
As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70
 2014-12-30 17:36:00 +00:00
Narayan Kamath
df44485698 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
automerge: bf0c614

* commit 'bf0c614d33673a0a037e317c8c25ad2e6c24e77d':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:22:57 +00:00
Narayan Kamath
bf0c614d33 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:20:32 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Esteban Talavera
ea84327fa4 Merge "Remove deprecated version of setProfileOwner that takes packageName" 2014-12-29 10:55:31 +00:00
Sungsoo Lim
2021082b4a Merge "Make mute/unmute work" 2014-12-29 04:52:21 +00:00
Sungsoo Lim
d1851e6e4e Make mute/unmute work 
Bug: 18844550
Change-Id: I431a223d55430aa8e1bb28f0275e11876ed0e0bb
 2014-12-29 11:34:23 +09:00
Craig Mautner
ebc440ea5d am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
automerge: 3551ce9

* commit '3551ce9d8e8244376d63b65e0352ffa03198ba2a':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:59:28 +00:00
Craig Mautner
3551ce9d8e am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:56:42 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
Robin Lee
77f9a44adb am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev automerge: c9db16c 
automerge: b6b7d42

* commit 'b6b7d4251cdab1843ae9b2ae167ac9276ada241e':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-28 05:51:19 +00:00
Robin Lee
b6b7d4251c am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
automerge: c9db16c

* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-28 05:36:20 +00:00
Jinsuk Kim
37c39e16be am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
automerge: 0abbba9

* commit '0abbba9f426c5dcbd0ffd1be6b0f3ba5b7f129c4':
  CEC: Let the caller check CEC device type
 2014-12-26 20:37:55 +00:00
Robert Greenwalt
7c02a41179 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
automerge: ce524dc

* commit 'ce524dc6836f57e859fd2a9f28dffe37cfa3a6ae':
  Fix timing between bcast and net setup.
 2014-12-26 20:36:43 +00:00
Jinsuk Kim
0abbba9f42 am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '266f2b047ebfb80a7fa72da302988fba4c902f43':
  CEC: Let the caller check CEC device type
 2014-12-26 20:30:42 +00:00
Robert Greenwalt
ce524dc683 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
  Fix timing between bcast and net setup.
 2014-12-26 20:30:32 +00:00
Dongwon Kang
b61077357e TIF: Add a null checking in TvInputHardwareManager. 
Bug: 18688119
Change-Id: I17fd89bfbb34666ad5e14bb6e946aa5347975d4c
 2014-12-26 14:53:14 +09:00
Esteban Talavera
8add57224f Remove deprecated version of setProfileOwner that takes packageName 
The ComponentName equivalent should be used instead.

Bug: 17654371
Change-Id: I7001e86ab1709b824944148a3c44af5243dacb83
 2014-12-24 09:38:13 +00:00
Nick Kralevich
eeb46442cc am 8454f2d4: am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code." 
automerge: 01d2586

* commit '01d25862efc542815014dc7a03ab90263a6191ba':
  Mods to the SELinuxMMAC engine code.
 2014-12-23 19:53:44 +00:00
Nick Kralevich
01d25862ef am 8454f2d4: am 5e1e38cc: Merge "Mods to the SELinuxMMAC engine code." 
* commit '8454f2d48517d79268688b2262b17ff0cab39622':
  Mods to the SELinuxMMAC engine code.
 2014-12-23 19:52:12 +00:00
Robert Craig
2e1f052f45 Mods to the SELinuxMMAC engine code. 
* We now require that all certs used to sign the apk and all
  certs stored with policy be tested for set equality. Prior
  efforts required that the cert included with policy only
  needed to match one of the certs included with an apk.

* Allowed a new tag to be included with policy describing the
  signatures. <cert signature=""/> is now allowed as a child
  element of the <signer> tag describing multiple certs. The
  old way of describing signatures attached as attributes to
  the root signer tag is still supported. The engine now treats
  it the same as if they used the new layout with the outer
  signature as the first signature value.

* Moved the class which holds all policy from an inner static
  to a builder pattern governed by the Policy.PolicyBuilder
  class. This will help provide more clarity and allow for
  easier enforcement of certain invariants as the policy
  representation is being built.

* Loads of new comments.

Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-12-23 18:30:31 +00:00
Robin Lee
c9db16c591 am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
* commit 'b4b14e391dbcde537350ccf649b3603cafba1e6c':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-23 13:29:05 +00:00
Robin Lee
b4b14e391d Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-mr1-dev 2014-12-23 12:30:28 +00:00
Sungsoo Lim
898de6fd8c Implement cloneTvInputEvent 
memcpy() only copies the memory address value of device_info.audio_address,
and it could be invalid when onDeviceAvailable() is called.

Bug: 18819334
Change-Id: I827da8032a982abf3029874b8454ca79290bb0e0
 2014-12-23 17:34:00 +09:00
Jinsuk Kim
266f2b047e am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '92ae5abf4dac470c5c915ec4782d5af6f251d257':
  CEC: Let the caller check CEC device type
 2014-12-22 22:53:58 +00:00
Jinsuk Kim
92ae5abf4d Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 2014-12-22 22:48:45 +00:00
Jinsuk Kim
98d760e1c3 CEC: Let the caller check CEC device type 
Device event listener mechanism invoke the callback on all kinds
of devices in order to deal with a caller who wants to get notified
for all types. TIF was changed to check the device type to make
sure it handles source type only.

Bug: 18832462
Change-Id: I5123fe79c09f623849b93b64d0c28e6a930dd437
 2014-12-23 07:39:11 +09:00
Robert Greenwalt
33868dab9a am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '4dcacef5c53e9d94beab777d79ecada86a15289b':
  Fix timing between bcast and net setup.
 2014-12-22 22:36:11 +00:00