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

118550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
f6d69ae0f9 Merge "Adding freeMemoryForTests static method to WebView." 2014-01-23 19:42:19 +00: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
Christopher Tate
8bc01824b9 am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '094efb3f5350b3ce95dcc790bc237c5caa901a20':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-22 17:47:04 -08:00
Christopher Tate
094efb3f53 am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '407f74f494e5374d9bdceae9d9fb453aa8270f6b':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-22 17:43:52 -08:00
Christopher Tate
407f74f494 Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 2014-01-23 01:40:37 +00:00
Dirk Dougherty
6bc2bb15fe am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '9971cbe92284e589d6540cbf22f17c816692bb62':
  Add samples TOC generated from browsable sources.
 2014-01-22 16:36:34 -08:00
Dirk Dougherty
9971cbe922 am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '94ac4f6855d84c6d40006002f43ad1f1a0447954':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:33:06 +00:00
Dirk Dougherty
94ac4f6855 Add samples TOC generated from browsable sources. 
(cherry picked from commit 1c64e2f429bfc97fcf64ebeaa0b3aa2d6b609a1d)

Change-Id: I085b68646565bbf904e70734008efe5cc9f21eda
 2014-01-23 00:28:35 +00:00
Christopher Tate
e1d18f6eb0 am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit '0e3df21642122ae8a43be1a35723782bdd417b7a':
  Only send storage intents after boot complete
 2014-01-22 15:53:58 -08:00
Christopher Tate
0e3df21642 am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit 'cc81bcece411794b4eac6b03b7700a0214fdbb87':
  Only send storage intents after boot complete
 2014-01-22 15:50:31 -08:00
Christopher Tate
cc81bcece4 Merge "Only send storage intents after boot complete" 2014-01-22 23:46:58 +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
quddusc
c99557c92c am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '0cb965a69aac9c2a83798960a0efeaa6e596e445':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-21 20:13:48 -08:00
quddusc
0cb965a69a am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit '5020a8736f3319d295d31bed421f837788878451':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 04:10:13 +00:00
quddusc
5020a8736f Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 2014-01-22 04:07:18 +00:00
quddusc
1dff746b02 cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da 
Change-Id: I40b79aee2302f1e32a9e8bc11d0b0415dcbe7705
 2014-01-21 18:53:57 -08:00
Scott Main
69edcce783 am d9d41f2d: am fbdcf317: fix code typo 
* commit 'd9d41f2db29a4bd9bcf3b064067f41742a9265e9':
  fix code typo
 2014-01-21 17:52:05 -08:00
Scott Main
d9d41f2db2 am fbdcf317: fix code typo 
* commit 'fbdcf317fa751dc7d629b5c38688369ea2acf0ad':
  fix code typo
 2014-01-22 01:49:36 +00:00
Christopher Tate
a7a9327be8 am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit '5474f085b05b527f7e1dc7c6f536736c2f043fb0':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-21 17:48:35 -08:00
Christopher Tate
5474f085b0 am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 
* commit '9fc157a4767f54d1cff53dc9489638b67aec2da3':
  FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-01-21 17:45:00 -08:00
Christopher Tate
9fc157a476 Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted" 2014-01-22 01:42:50 +00:00
Scott Main
fbdcf317fa fix code typo 
Change-Id: I66c86cb778a7e2237e71a7a70dee420d82a5e557
 2014-01-21 10:12:07 -08:00
Naofumi Harada
719b3b8075 FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.

Bug: 12640283

Change-Id: Ic24b5882f65dabdfae9cc39da3d68661bed4fc31
 2014-01-21 07:41:11 +00:00
Deepanshu Gupta
35d56c0d67 Optimize layout rendering in layoutlib 
The height of a layout should be zero if it is assigned a layout_weight.
This way, the layout is measured only once and prevents spurious errors.

Bug: https://code.google.com/p/android/issues/detail?id=58398
Change-Id: If49a7480e5eb82cb86780e00f2f5b65ee053fc2a
 2014-01-20 17:02:37 -08:00
Johan Redestig
0464c07a9e Only send storage intents after boot complete 
It is not possible to send a broadcast before the system
boot is completed. If you do it anyway you will get an
IllegalStateException: Cannot broadcast before boot completed.

If a memory card is inserted or removed while the phone is
booting up, there is a risk that the MountService will try to
broadcast a storage intent too early, and cause the device
to crash.

Use FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT to avoid
problems with too early broadcasts.

Change-Id: Ied36a13d235df37c9788e45a35de40d919ae0cd0
 2014-01-18 22:46:56 +01: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
aa80f1a3ca am c9a60b0f: Merge "Don\'t confuse stat and stat64." 
* commit 'c9a60b0f77525244ac4f970258703b8dc62ee140':
  Don't confuse stat and stat64.
 2014-01-17 18:36:02 -08:00
Elliott Hughes
c9a60b0f77 Merge "Don't confuse stat and stat64." 2014-01-18 02:32:40 +00:00
Elliott Hughes
ad076286c3 Don't confuse stat and stat64. 
Bug: 11865851
Change-Id: I45e65036d86c58943b9c273777f3f8be79a6966f
 2014-01-17 18:27:27 -08:00
Deepanshu Gupta
58037a4404 Add missing files to fix libphonenumber for layoutlib. 
Change-Id: I8102da6c1c4625e887293a8823770d199521c53f
 2014-01-17 18:26:38 -08:00
Chris Craik
e9a7d22963 am 66b5a2b2: am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit '66b5a2b25bbe9844fc538e383922a0866c0baec0':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 11:24:02 -08:00
Chris Craik
66b5a2b25b am 5150eb8f: Merge "Initialize pointer members to NULL to avoid illegal reference" 
* commit '5150eb8f5f66104a8bc0884f9eb348e3f08ee6fb':
  Initialize pointer members to NULL to avoid illegal reference
 2014-01-17 11:20:38 -08: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
Chris Craik
5150eb8f5f Merge "Initialize pointer members to NULL to avoid illegal reference" 2014-01-17 18:41:15 +00:00
Narayan Kamath
251de854f0 am 53e9bfae: Merge "Fix error checking in MemoryFile." 
* commit '53e9bfaee1064f1858c307409e51aa4566ae4b95':
  Fix error checking in MemoryFile.
 2014-01-17 09:36:23 -08:00
Ashok Bhat
33d603877a AArch64: Use long for pointers in DRM classes 
For storing pointers, long is used in DRM classes,
as native pointers can be 64-bit.

In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)

Change-Id: I101b0ea19ed93651c6ad1a9fa55e14e8be117469
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
 2014-01-17 14:38:25 +00:00
Narayan Kamath
53e9bfaee1 Merge "Fix error checking in MemoryFile." 2014-01-17 10:25:27 +00:00
lina.x.pi
920287399a Initialize pointer members to NULL to avoid illegal reference 
mBitmap and mTexture is not initialized to NULL which causes
illegal address access when it fails to be created from
oversized bitmap.

Change-Id: Iea54bec8788bc5f3a10040fdb43f416c0d41a14c
 2014-01-17 13:49:26 +09:00
Joe Fernandez
12382d13ff am fcab250d: am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit 'fcab250de89352613e3dd8fe6efa180c0a7df4d0':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-16 14:52:56 -08:00
Joe Fernandez
75a09a752a am 94149cfb: am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit '94149cfb3409244fa2d91ee87c0b4d531447110a':
  Fixing bugs in MediaPlayer docs
 2014-01-16 14:52:51 -08:00
Joe Fernandez
fcab250de8 am 16fe3737: Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 
* commit '16fe3737457ac844da09cd062e23abedbcc1f3e8':
  docs: Added note to Support Library Setup page: mediarouter to appcompat dependency
 2014-01-16 22:49:46 +00:00
Joe Fernandez
94149cfb34 am acf2b906: Merge "Fixing bugs in MediaPlayer docs" into klp-docs 
* commit 'acf2b906b34d7c1d16ecb039390f656784c6d034':
  Fixing bugs in MediaPlayer docs
 2014-01-16 22:49:42 +00:00
Joe Fernandez
16fe373745 Merge "docs: Added note to Support Library Setup page: mediarouter to appcompat dependency" into klp-docs 2014-01-16 22:46:56 +00:00
Joe Fernandez
acf2b906b3 Merge "Fixing bugs in MediaPlayer docs" into klp-docs 2014-01-16 22:46:17 +00:00
quddusc
c2cc299998 am 7e8a997f: am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '7e8a997fdf8acb90d81d57e1563a8d9f858464bd':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 08:08:24 -08:00
quddusc
7e8a997fdf am 62729b15: Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 
* commit '62729b15a91525cef4dd27226099c245d38e6495':
  docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095
 2014-01-16 16:05:54 +00:00
quddusc
62729b15a9 Merge "docs: Removed obsolete screenshot of Play Store purchase flow. Bug: 9846095" into klp-docs 2014-01-16 16:03:06 +00:00
Narayan Kamath
d569e21dac am 48de490c: am 486544f7: Merge "AArch64: Use long for pointers in view/input classes" 
* commit '48de490c33cac16ed82d753799d7add804f72977':
  AArch64: Use long for pointers in view/input classes
 2014-01-16 07:35:25 -08:00
Narayan Kamath
42defa0233 am faa62aac: am 84ee7930: Merge "AArch64: Use long for pointers in android/os/MessageQueue" 
* commit 'faa62aaca5f4a149f20487d42279fefc7d356428':
  AArch64: Use long for pointers in android/os/MessageQueue
 2014-01-16 07:35:20 -08:00