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

148714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RoboErik
6d4fd5dc12 am 9ea4316f: Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 
* commit '9ea4316f4ce8c4bb4a9a1dad8332e300dc475890':
  Fix crash in legacy apps that register without a looper
 2014-08-15 18:15:06 +00:00
Narayan Kamath
178d65729e am f58fd973: Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 
* commit 'f58fd973f4f9f712d9d97b26e6c3afd22145463a':
  Fix getPackageInfo for the "android" package in the system server.
 2014-08-15 18:04:01 +00:00
Andres Morales
63cec26dd0 am f099ee6a: Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 
* commit 'f099ee6ae4cc4f2d66a1c31f4cd2a908d0e02082':
  Fix issue where unlock handlers are not properly updated
 2014-08-15 17:25:11 +00:00
Adam Lesinski
a25222f5dc am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev 
* commit '41cdc4c75c2ea8c67bcb773cd422b405e025fa25':
  Revert "Fix aapt dump for APKs with no resources"
 2014-08-15 17:25:04 +00:00
Brian Carlstrom
d38905b785 am 7fca8e30: Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 
* commit '7fca8e30e91f893a2831e63c1a47a86baf2c56b8':
  Disable verification based on vold.decrypt. [frameworks/base]
 2014-08-15 17:10:46 +00:00
John Spurlock
2a5c373615 am 0ac3062e: Zen: Downtime now a condition provider, persist conditions. 
* commit '0ac3062ed9aab98c26e669a91a0c3893a440b734':
  Zen: Downtime now a condition provider, persist conditions.
 2014-08-15 15:16:19 +00:00
John Spurlock
4db0d98b42 Zen: Downtime now a condition provider, persist conditions. 
- Persist the entire exit condition instead of only the id.
- Make downtime a proper condition provider (similar to the
  existing countdown provider for time-based conditions)
- Move all downtime-related items out of ZenModeHelper and
  into the new condition provider.
- Reevaluate downtime more often, when any of its inputs change.
- Make sure downtime appears as an available condition in the
  condition panel when applicable.

Bug:16296125
Bug:16211189
Bug:17031767
Change-Id: I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
 2014-08-15 15:06:15 +00:00
Adrian Roos
49d9653ee4 am 5a7b75c0: Remove setManagingTrust workaround 
* commit '5a7b75c0c02f22b97e871f32b21470629e84ce9a':
  Remove setManagingTrust workaround
 2014-08-15 14:35:38 +00:00
Adrian Roos
65c09b10ca Remove setManagingTrust workaround 
Bug: 16622870
Change-Id: Ibdfdd420996081c055d0364f77b65dea6060cb9e
 2014-08-15 14:29:55 +00:00
Zoltan Szatmary-Ban
207029f122 am 3e941c33: Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 
* commit '3e941c339229396864196730c4b069cc437c6ad0':
  Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""
 2014-08-15 14:13:49 +00:00
Calin Juravle
2da6da4938 am a3748052: Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 
* commit 'a37480520161a7bb0f40320d99a87327aadd95d5':
  Integrate NativeActivity with NativeBridge interfaces
 2014-08-15 13:16:55 +00:00
Selim Cinek
8da5491dee am 600f1eff: Merge "Fixed several bugs with the notification shade" into lmp-dev 
* commit '600f1eff7f8a6239f0a7899f0ac483c7c4bd6f28':
  Fixed several bugs with the notification shade
 2014-08-15 13:16:51 +00:00
Narayan Kamath
fa91979fbf am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev 
* commit '09e5ce88ff55ee3421924760137bc8ea2fcda968':
  Remove system_server classes from the boot image.
 2014-08-15 13:12:37 +00:00
Zoltan Szatmary-Ban
68692b0657 am 856e0928: Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 
* commit '856e0928cf989876678e9af5d62a29b871d7eed3':
  Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""
 2014-08-15 13:04:50 +00:00
Narayan Kamath
c89b1f0a42 am a7d930a0: Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 
* commit 'a7d930a070e53b4306034eab7ba315642f2591a4':
  Revert "Revert "Revert "Update Trusted Credentials screen in settings"""
 2014-08-15 12:38:41 +00:00
Narayan Kamath
0d2e545235 am a6b01d21: Merge "Validate instruction sets passed to installd." into lmp-dev 
* commit 'a6b01d21fa64df6283734e8f5e1aa41edcfff912':
  Validate instruction sets passed to installd.
 2014-08-15 12:03:51 +00:00
Zoltan Szatmary-Ban
197a72a709 am 19c8ce29: Revert "Revert "Update Trusted Credentials screen in settings"" 
* commit '19c8ce291e89a9ef1442a20e1feab421b11536d7':
  Revert "Revert "Update Trusted Credentials screen in settings""
 2014-08-15 12:03:47 +00:00
Zoltan Szatmary-Ban
1e7bc0def8 Revert "Revert "Update Trusted Credentials screen in settings"" 
This reverts commit 0f0de0bdd021bad5f85fdb0399a4ea91a1611e25.

Change-Id: Ia3d0907e3d7c2ec42d64e45f60e3dfaffb932c3d
 2014-08-15 12:55:35 +01:00
Andres Morales
e6b63e6c6f Merge "Fix issue where unlock handlers are not properly updated" into lmp-dev 2014-08-15 08:11:59 +00:00
Andres Morales
f9a97942e1 Fix issue where unlock handlers are not properly updated 
If an unlock handler already exists, we need to try
to update the tech mask for it. Don't permit unlock
handlers with no tech mask.

Bug: 17054331
Change-Id: I54a885d28bdd8ce41d8646d968621c7d6abc9387
 2014-08-15 17:08:24 +00:00
Adam Lesinski
5b9c045a6a am b4c3c976: Fix crash in ResStringPool 
* commit 'b4c3c9761bcdbf9ed3eb01c0145294dd730666bf':
  Fix crash in ResStringPool
 2014-08-15 07:05:43 +00:00
Adam Lesinski
4b2d0f20db Fix crash in ResStringPool 
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
 2014-08-15 06:39:01 +00:00
Brian Carlstrom
261e240c05 Merge "Disable verification based on vold.decrypt. [frameworks/base]" into lmp-dev 2014-08-15 05:27:16 +00:00
Brian Carlstrom
df6c83fa7b Disable verification based on vold.decrypt. [frameworks/base] 
Bug: 15165413
Change-Id: I7aff8e2a2890971fe97769d42121c207dc36aa7c
 2014-08-15 09:58:03 -07:00
RoboErik
09f6e61489 Merge "Fix crash in legacy apps that register without a looper" into lmp-dev 2014-08-15 04:58:06 +00:00
Zoltan Szatmary-Ban
2b13c5641a Merge "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" into lmp-dev 2014-08-15 04:54:19 +00:00
Zoltan Szatmary-Ban
f8d72cc14f Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" 
This reverts commit 87efe74e092236c372d3b6909009641123aa416a.

This should be fine now with all the dependency CLs +2-ed


Change-Id: I96ad14ad5ff81e6b5391035cb6c5a62339c6cc40
 2014-08-15 12:58:37 +00:00
Narayan Kamath
f75aadc028 Revert "Revert "Revert "Update Trusted Credentials screen in settings""" 
This reverts commit 19c8ce291e89a9ef1442a20e1feab421b11536d7.

Change-Id: Ie5a5571127311e0a29f314c0566e779cfe940b53
 2014-08-15 12:25:52 +00:00
Narayan Kamath
bdc78678de Merge "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""" into lmp-dev 2014-08-15 04:54:19 +00:00
Zoltan Szatmary-Ban
9c7ed91d78 Merge "Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings"""""" into lmp-dev 2014-08-15 04:38:54 +00:00
Zoltan Szatmary-Ban
3291de8f6c Revert "Revert "Revert "Revert "Revert "Update Trusted Credentials screen in settings""""" 
This reverts commit c9249c69813c6fb889d71d84583c67ae2942e6de.

Change-Id: I5504fddaf7b18efb73cd6c76678b3b39ce9b0229
 2014-08-15 14:01:14 +00:00
Calin Juravle
ec92397894 Merge "Integrate NativeActivity with NativeBridge interfaces" into lmp-dev 2014-08-15 04:38:54 +00:00
Yong WU
abd76d0a09 Integrate NativeActivity with NativeBridge interfaces 
Bug: 16884833

(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
 2014-08-15 13:22:30 +01:00
Adam Lesinski
89147ed84b Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev 2014-08-15 04:37:53 +00:00
Adam Lesinski
18560886cb Revert "Fix aapt dump for APKs with no resources" 
This reverts commit 0e475302cd196f45a01a525c49089018b238d4ba.

I'll re-upload this CL with the correct fix in LoadedApk.

Change-Id: I17c6381f8e5907dab9f996f89c5d435b9c08a13a
 2014-08-15 17:18:21 +00:00
Jeff Sharkey
07a36b1889 am b76b06d8: Merge "Some networks may have null ifaces, I guess?" into lmp-dev 
* commit 'b76b06d8efcc13ada2aaa250540a65fb8d60560a':
  Some networks may have null ifaces, I guess?
 2014-08-15 04:36:05 +00:00
Narayan Kamath
2b3b706e14 Merge "Fix getPackageInfo for the "android" package in the system server." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
3480ab45c8 Fix getPackageInfo for the "android" package in the system server. 
bug: 16555230
Change-Id: I90ebf9b35fda8246b0079f67b1469f96c3b4ede2
 2014-08-15 18:14:44 +01:00
Selim Cinek
afd7f117b3 Merge "Fixed several bugs with the notification shade" into lmp-dev 2014-08-15 04:32:23 +00:00
Selim Cinek
31094df5c6 Fixed several bugs with the notification shade 
Cleaned up the code around mMaxPanelHeight of the
PanelView which could lead to flickering during
peeking.
Changed the panel opening logic to account for lag
when we need to wait for a layout, which could lead
to inconsistent animations.
Fixed a bug where holes could appear in the shade
when notifications were updating.
This also improved the general updating behaviour
which is now done in a nicer animation.

Bug: 15942322
Bug: 15861506
Bug: 15168335
Change-Id: Ifd7ce51bea6b5e39c9b76fd0d766a7d2c42bf7a4
 2014-08-15 13:43:47 +02:00
Narayan Kamath
35cbf0e450 Merge "Remove system_server classes from the boot image." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image. 
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
 2014-08-15 13:37:03 +01:00
Narayan Kamath
5dc4a440d1 Merge "Validate instruction sets passed to installd." into lmp-dev 2014-08-15 04:32:23 +00:00
Narayan Kamath
6c4b9de8f1 Validate instruction sets passed to installd. 
We don't want folks passing down arbitrary strings.

bug: 16837404
Change-Id: I73ac66b376f1401f9f95f3c6323da6242ac8ed3d
 2014-08-15 12:50:10 +01:00
Craig Mautner
f405938248 am e1de4a43: Merge "Fix race condition between binder deaths" into lmp-dev 
* commit 'e1de4a43e9dadc62114c96fbc4bae21a63357c1a':
  Fix race condition between binder deaths
 2014-08-15 02:23:11 +00:00
Sailesh Nepal
e628bb27f4 am 1d932b53: Use thread safe set for RemoteConnection.mListeners 
* commit '1d932b53945a35ac918e3ec26fc29c37850e01b5':
  Use thread safe set for RemoteConnection.mListeners
 2014-08-15 02:06:43 +00:00
Sailesh Nepal
cdb421cfe5 am b4e212cf: Include more state in ParcelableConnection 
* commit 'b4e212cf8434f3203c667b3d02a6fa9920950f57':
  Include more state in ParcelableConnection
 2014-08-15 02:06:37 +00:00
Justin Mattson
f52a4091e2 am 48734f62: Merge "Tweak leanback form style" into lmp-dev 
* commit '48734f62e15475def05135b7cf1741c33256ebaf':
  Tweak leanback form style
 2014-08-15 02:06:01 +00:00
RoboErik
78c64cdbd8 Fix crash in legacy apps that register without a looper 
Some legacy apps registered their media button receiver in a thread
without a looper. If this happens we need to use the main looper to
prevent a crash.

bug: 16306226
Change-Id: Idf472e649393e2a7ce2a3e1cbb3476003ab17f34
 2014-08-14 18:42:54 -07:00
Adam Lesinski
bf4c1cfc5b am 83b8dc7e: Merge "Fix aapt dump for APKs with no resources" into lmp-dev 
* commit '83b8dc7e35d64d784982a5ac6403802b9f1252db':
  Fix aapt dump for APKs with no resources
 2014-08-15 01:41:46 +00:00