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

45849 Commits

Author SHA1 Message Date
Narayan Kamath
1cd2834fde am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit '30e20ac528731a778eec45506d1e57c8839b318a':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 12:07:15 +00:00
Narayan Kamath
30e20ac528 am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'ebd43d46ebf53005ae60af59948f8ed634f9bafb':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 12:04:30 +00:00
Narayan Kamath
ebd43d46eb am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'dff83e2b121b356a264e908f8a7d64584eab9b73':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 04:01:15 -08:00
Narayan Kamath
d5970e9ca3 Merge "AssetManager cookies should be int32_t and not void*." 2014-01-27 11:56:03 +00:00
Narayan Kamath
745d4efc83 AssetManager cookies should be int32_t and not void*. 
Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

(cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7)
(cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215)
(cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd)

Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
 2014-01-27 11:20:24 +00:00
Griff Hazen
9e24357ddb Make MANAGE_ACTIVITY_STACKS a signature|system permission. 
To allow ActivityView support within privileged apps.

Change-Id: Ic0246939bf71c52ca9415149415a976537c8270b
 2014-01-26 21:58:51 -08:00
Wink Saville
dafb2420a3 am d4b688cf: am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd4b688cf97736eb4c543149686ab851b9ea21161':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:55:49 +00:00
Wink Saville
d4b688cf97 am d165f365: am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd165f365b394b7632d8a0cfbc14bbf4004858333':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 16:52:26 +00:00
Wink Saville
d165f365b3 am 5d2d911a: am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit '5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 08:49:09 -08:00
Mathieu Chartier
768480c245 Fix dest == src bugs in Matrix.cpp. 
The main bug was that the AutoJavaFloatArray autoSrc was not passing in
read only. This meant that the destructor overwrote the data which
the autoDst AutoJavaFloatArray had written in it's destructor.
This case only happened if src == dest and the arrays were copies.
Also improved performance by passing in read only a few other places.

Bug: 12570144

Change-Id: Idc8764087dc165433c584b87a0f9d4ed0ec795e8
 2014-01-25 17:54:22 -08:00
Wink Saville
d1eeb67478 Merge "Telephony: Modify code to check that PUK code length is always 8." 2014-01-25 21:51:34 +00:00
Jeff Brown
fce5890a11 Fix NPE in deleteDatabase(). 
If the directory containing the database does not exist then
listFiles() will return null.  Tolerate this situation instead
of crashing.

Bug: 12600784
Change-Id: I5d83a867a5e8478f50887e5798b42c5f6859b77c
 2014-01-24 13:20:57 -08:00
Jeff Brown
8aca9e335f Hide an old debug function. 
Change-Id: If12b967955847d257dac0431dabe0dca41865b58
 2014-01-24 13:10:19 -08:00
Narayan Kamath
5d094b947b am aa43eb51: am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit 'aa43eb518ce3c50c1b9a64fc526c8d1360d3789e':
  Remove unused field from AssetManager.
 2014-01-24 09:48:36 +00:00
Narayan Kamath
aa43eb518c am 7866f2fc: am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '7866f2fcfa753154a492bfb3fb21061f6fcce709':
  Remove unused field from AssetManager.
 2014-01-24 09:45:13 +00:00
Narayan Kamath
7866f2fcfa am 8005b9af: am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '8005b9af11ea366672d739769510240f931f3050':
  Remove unused field from AssetManager.
 2014-01-24 01:42:08 -08:00
Selim Gurun
2474ebe879 am 0a33c4f9: am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '0a33c4f9f54b59dac4e745e09db05990d53a1aba':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:46:56 +00:00
Selim Gurun
0a33c4f9f5 am 6735020a: am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit '6735020adbcc7028185ca536e2b2cb49ec7687fb':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 22:42:00 +00:00
Selim Gurun
6735020adb am d261243c: am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'd261243c146515184cb4caf2284c6764a045443a':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:39:53 -08:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView." 
This reverts commit c6a2a6e20f7ddd5a903e9395f6c574c316960694.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
 2014-01-23 22:13:40 +00:00
Selim Gurun
647c5160a2 am b311739d: am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'b311739d6fd2fdc5a3607ad79a1547af8500cfae':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:59:19 +00:00
Selim Gurun
b311739d6f am d9c2e3d3: am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'd9c2e3d30f7af615ae78848f6a7f52ed5c539d33':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 19:54:15 +00:00
Selim Gurun
d9c2e3d30f am 01607523: am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit '016075239fc28704bb0e2b78a3c5540fde711eea':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 11:51:22 -08:00
Selim Gurun
c6a2a6e20f Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
Bug: b/10629847

(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
 2014-01-23 11:21:00 -08:00
Ashok Bhat
8ab665dda4 AArch64: Make Binder and Parcel 64-bit compatible 
Changes include
[x] Long is used to store native pointers

[x] Added new method obtain(long obj) to Parcel. Binder
    uses this method instead of obtain(int obj).

[x] obtain(int) has been changed to throw unsupported
    operation exception.

Change-Id: I408e0f2a24deb28c9277d86670653a51eb314266
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-01-23 16:25:19 +00:00
Narayan Kamath
2f756cbb5a Remove unused field from AssetManager. 
This field was introduced in commit 4bdd33b81a17 but wasn't
used there (or since).

Change-Id: I0615e98b8990d42da6b85f8094ab19eb0465fd9e
 2014-01-22 11:09:09 +00:00
Elliott Hughes
a850e5ac27 am 8815d261: am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8815d261d9fefbac8f24936dc37a055ab9ced038':
  Don't confuse stat and stat64.
 2014-01-18 02:44:06 +00:00
Elliott Hughes
8815d261d9 am 8da106eb: am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
  Don't confuse stat and stat64.
 2014-01-18 02:42:01 +00:00
Elliott Hughes
8da106ebf3 am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
  Don't confuse stat and stat64.
 2014-01-17 18:38:17 -08:00
Elliott Hughes
ad076286c3 Don't confuse stat and stat64. 
Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
 2014-01-17 18:27:27 -08:00
Jeff Brown
e2c9cd583f Merge "Refactor display manager service to new pattern." into klp-modular-dev 2014-01-18 01:44:08 +00:00
Narayan Kamath
8582264dbf am 766c95be: am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '766c95be6f3eb33f40241058c0503123e334050f':
  Fix error checking in MemoryFile.
 2014-01-17 19:26:23 +00:00
Narayan Kamath
766c95be6f am e66fa5c1: am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit 'e66fa5c1851f48dce95364dc0acbde1b9f39f160':
  Fix error checking in MemoryFile.
 2014-01-17 19:23:12 +00:00
Narayan Kamath
e66fa5c185 am 251de854: am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '251de854f02a22ae613964de7ec96f2e0816e503':
  Fix error checking in MemoryFile.
 2014-01-17 11:19:57 -08:00
Jeff Brown
4ccb823a9f Refactor display manager service to new pattern. 
Transform DisplayManagerService into a SystemService and start cleaning
up other local services that it uses from window manager and input manager.

Clean up service thread initialization.

Remove unnecessary static variables from ActivityManagerService.

It's starting to become clear that we really need a better way to manage
service dependencies.  Boot phases don't quite cut it.

Change-Id: If319dbd7cbfbd4812fe55ece969e818d4b20755b
 2014-01-16 22:16:42 -08:00
Jeff Brown
6f357d3284 Start untangling system server early bootstrapping. 
Refactored SystemServer to get rid of a bunch of legacy cruft related
to how the ServerThread used to be started up.

Create system context first when system server starts.  This removes
the tangled initialization order dependency that forced us to start
the activity manager service before most anything else.

Moved factory test related constants into the FactoryTest class.

Partially migrated Installer, ActivityManagerService, and
PowerManagerService to the new SystemService pattern.  There's more
work to be done here, particularly around the lifecycle of the
power manager.

Bug: 12172368
Change-Id: Ia527dd56e3b3fd90f9eeb41289dbe044921230d4
 2014-01-16 11:24:58 -08:00
Narayan Kamath
23b7e0a32b am d8facb67: am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit 'd8facb6763638178bd12f1010466e426c0754f49':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 15:42:14 +00:00
Narayan Kamath
275586aa53 am 7471dfc4: am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit '7471dfc4a894ade4cd83949d2b59b9b7e75bbf92':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 15:42:09 +00:00
Narayan Kamath
8492e88a23 am 077386db: am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure" 
* commit '077386dbda31bfef96acca3a1ba84fece67e391a':
  AArch64: Use long for pointers in graphics/PathMeasure
 2014-01-16 15:42:03 +00:00
Narayan Kamath
419267a164 am 213f243f: am 87a82800: am aef12450: am 1b0f0be0: Merge "Make YuvToJpegEncoder more JNI compliant" 
* commit '213f243f35e8ad7b605c91c08ce6271302d211a7':
  Make YuvToJpegEncoder more JNI compliant
 2014-01-16 15:41:58 +00:00
Narayan Kamath
6706888e24 am 775667c0: am 03e8be75: am 8796ab7f: am bb35356d: Merge changes Id54087dd,I946325e4,I2a2b2e68 
* commit '775667c070f6e0375e7a247d30a34b0073d7fd5b':
  AArch64: Use long for pointers in BitmapRegionDecoder
  AArch64: Use long for pointers in Movie class
  AArch64: Add AssetInputStream.getNativeAsset
 2014-01-16 15:41:52 +00:00
Narayan Kamath
e18f0e2a46 am 19bd2c28: am ab220dee: am 947d88a0: am 138d67c8: Merge "AArch64: Use long for pointers in MotionEvent class" 
* commit '19bd2c28f9c3e4db12cad93ed2a69c17c95e42fd':
  AArch64: Use long for pointers in MotionEvent class
 2014-01-16 15:41:47 +00:00
Narayan Kamath
e413dae892 am 8e96d73a: am e488f2c1: am a0b25d41: am d85bba8e: Merge "AArch64: Use long for pointers in VelocityTracker class" 
* commit '8e96d73a755348b25ceb80f907eae15be2da0d75':
  AArch64: Use long for pointers in VelocityTracker class
 2014-01-16 15:41:41 +00:00
Narayan Kamath
c45068e4a4 am d7a54c65: am 31f10bb2: am 80b3dd0d: am 27a647bf: Merge "AArch64: Use long for pointers in android/os/MemoryFile" 
* commit 'd7a54c6574c3ca759e977f27912caecb6b40e827':
  AArch64: Use long for pointers in android/os/MemoryFile
 2014-01-16 15:41:35 +00:00
Narayan Kamath
a5a0d384fc am 425b08f1: am c1abb5e3: am 53321d99: am f19c50d6: Merge "AArch64: Use long for pointers in KeyCharacterMap class" 
* commit '425b08f14419a1e67a3d9d2c9b97ea61ecd4f5cb':
  AArch64: Use long for pointers in KeyCharacterMap class
 2014-01-16 15:41:30 +00:00
Narayan Kamath
28c6ec0215 am 1d78ae42: am 24d63a83: am bc0468e6: am 6f17adba: Merge "AArch64: Use long for pointers in media classes" 
* commit '1d78ae42d0c5968bec0649784000063b689b2c51':
  AArch64: Use long for pointers in media classes
 2014-01-16 15:41:24 +00:00
Elliott Hughes
8bb8caa2b1 am c12410f1: am c3be4ba3: am 12377887: am 991e9818: Merge "AArch64: Use long for pointers in speech/srec classes" 
* commit 'c12410f1a3b951126a02ad5fe4160bc830a860ec':
  AArch64: Use long for pointers in speech/srec classes
 2014-01-16 15:41:18 +00:00
Narayan Kamath
d8facb6763 am d569e21d: am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit 'd569e21dac38fffe0e6a7f935e9a6965495b87d4':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 15:38:34 +00:00
Narayan Kamath
7471dfc4a8 am 42defa02: am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit '42defa02337b94d25714fe737f749f2c3300c790':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 15:38:29 +00:00
Narayan Kamath
077386dbda am 6b81bfd1: am caea42fd: am 98002dfb: Merge "AArch64: Use long for pointers in graphics/PathMeasure" 
* commit '6b81bfd10f63c166ff6e4afb0f267ce9e5275366':
  AArch64: Use long for pointers in graphics/PathMeasure
 2014-01-16 15:38:24 +00:00