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

118870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Griff Hazen
e2bb257c34 Merge "Make MANAGE_ACTIVITY_STACKS a signature|system permission." into klp-modular-dev 2014-01-27 18:31:15 +00:00
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
dff83e2b12 am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." 
* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.
 2014-01-27 03:58:32 -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
Wink Saville
5d2d911ad1 am d1eeb674: Merge "Telephony: Modify code to check that PUK code length is always 8." 
* commit 'd1eeb6747820f549ec724546a84e3860b4580587':
  Telephony: Modify code to check that PUK code length is always 8.
 2014-01-26 08:43:28 -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
Craig Mautner
38eda9c42b Remove unnecessary logging. 
Fixes bug 12593710.

Change-Id: I55c33bb4d6c9e17e810be7cc033e01fb9d2d6cf7
 2014-01-24 17:26:52 -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
Narayan Kamath
8005b9af11 am 3c30eff6: Merge "Remove unused field from AssetManager." 
* commit '3c30eff63fb33901df4e040ecce78f7755be588f':
  Remove unused field from AssetManager.
 2014-01-24 01:39:47 -08:00
Narayan Kamath
3c30eff63f Merge "Remove unused field from AssetManager." 2014-01-24 09:27:48 +00: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
d261243c14 am a3106d1d: Merge "Revert "Adding freeMemoryForTests static method to WebView."" 
* commit 'a3106d1dbe5141a6df742262f4bbe8cf2c8ea915':
  Revert "Adding freeMemoryForTests static method to WebView."
 2014-01-23 14:37:15 -08:00
Selim Gurun
a3106d1dbe Merge "Revert "Adding freeMemoryForTests static method to WebView."" 2014-01-23 22:26:33 +00: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
016075239f am f6d69ae0: Merge "Adding freeMemoryForTests static method to WebView." 
* commit 'f6d69ae0f9215e08137b010acb4076a30e3d28c6':
  Adding freeMemoryForTests static method to WebView.
 2014-01-23 11:49:00 -08:00
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
Christopher Tate
a5bb65aaf0 am f2c67e24: am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit 'f2c67e24e460e0d887bdd5167fccac9d5c54f34a':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-23 01:56:39 +00:00
Christopher Tate
f2c67e24e4 am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value" 
* commit '8bc01824b999f097aa211c9de9e4dff6a0497432':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
 2014-01-23 01:50:10 +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
6cc8c56a14 am 830b3df3: am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '830b3df3fa226a961deb35bd39cb49eb6eccbf56':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:43:10 +00:00
Dirk Dougherty
830b3df3fa am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources. 
* commit '6bc2bb15fe25a4378a759d697de12de0c8d8725f':
  Add samples TOC generated from browsable sources.
 2014-01-23 00:40:07 +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
222496f82f am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit '5d734dbc56cd2d4350f4a35f1bedbb6b40247e5c':
  Only send storage intents after boot complete
 2014-01-23 00:01:01 +00:00
Christopher Tate
5d734dbc56 am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete" 
* commit 'e1d18f6eb0e46b7a71ce7cf9ddb1c60dd7ad054f':
  Only send storage intents after boot complete
 2014-01-22 23:57:47 +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
ddef0ec94b am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'fbb2a9753176af340d18fa6b72a1e0e46c7c3c6f':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:50:56 +00:00
quddusc
fbb2a97531 am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da" into klp-docs 
* commit 'c99557c92c9bebc089c4eb7bf37a63dca8f28a6a':
  cherrypick from jb-mr2-docs docs: Training class for game controllers. Change-Id: I697770aee8604c965c3730691459c1e8f10705da
 2014-01-22 05:46:32 +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