Nick Kralevich
17879644e1
am b4c4f4c7: am 5a286051: Merge "PackageParser: remove temporary code." into jb-mr1-dev
...
* commit 'b4c4f4c74de3be5a45629a0c17b46e796c98df05':
PackageParser: remove temporary code.
2012-08-08 17:23:14 -07:00
Nick Kralevich
b4c4f4c74d
am 5a286051: Merge "PackageParser: remove temporary code." into jb-mr1-dev
...
* commit '5a28605155e51cdbd58737a8b7c47b337c5539bb':
PackageParser: remove temporary code.
2012-08-08 17:21:28 -07:00
Nick Kralevich
5a28605155
Merge "PackageParser: remove temporary code." into jb-mr1-dev
2012-08-08 17:19:06 -07:00
Amith Yamasani
7f0e543de3
am 4fe1082e: am 8264408f: Start the correct settings from the status bar.
...
* commit '4fe1082ec60359baef1ccac2b3a74834fe862303':
Start the correct settings from the status bar.
2012-08-08 16:57:19 -07:00
Amith Yamasani
4fe1082ec6
am 8264408f: Start the correct settings from the status bar.
...
* commit '8264408f5995534f8e3147b001664ea0df52aaa5':
Start the correct settings from the status bar.
2012-08-08 16:55:30 -07:00
Amith Yamasani
8264408f59
Start the correct settings from the status bar.
...
Added a new method to Context: startActivityAsUser() requiring the
INTERACT_ACROSS_USERS_FULL permission.
Show the correct Recents list, based on current user.
Added a getRecentTasksForUser() in ActivityManager. Hidden and requires
the INTERACT_ACROSS_USERS_FULL permission.
Change-Id: If5b56465efdd3ead36601a3b51ed4af157bbf35c
2012-08-08 16:52:53 -07:00
Jeff Sharkey
57b7105835
resolved conflicts for merge of ab4e251a to master
...
Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7
2012-08-08 16:39:00 -07:00
Jeff Sharkey
ab4e251a8e
am fb11ffa2: Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev
...
* commit 'fb11ffa2a04f0a6b1291cd7ffc68032fcc322312':
Isolate NetworkStateTracker creation, test.
2012-08-08 16:28:10 -07:00
Jeff Sharkey
fb11ffa2a0
Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev
2012-08-08 16:25:41 -07:00
Jeff Sharkey
e7f15b2286
am 6c73eb8a: am 82f479d0: Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev
...
* commit '6c73eb8a73449ff87964936a1cc3e2d463fa7fab':
Cleaner controls between Vpn and init services.
2012-08-08 16:25:34 -07:00
Jeff Sharkey
6c73eb8a73
am 82f479d0: Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev
...
* commit '82f479d0647855148af84fe2ba5484cb188c92cc':
Cleaner controls between Vpn and init services.
2012-08-08 16:23:59 -07:00
Jeff Sharkey
fb878b66b9
Isolate NetworkStateTracker creation, test.
...
Change ConnectivityService to use a factory when creating
NetworkStateTrackers, which gives us a good place to inject mocks
for testing. Add initial tests to verify that network routes are
added and removed as networks changed.
Change-Id: I11cbc61a84c2ed4afa2670036295b1494eab26e1
2012-08-08 16:23:41 -07:00
Jeff Sharkey
82f479d064
Merge "Cleaner controls between Vpn and init services." into jb-mr1-dev
2012-08-08 16:22:23 -07:00
Romain Guy
9594dff297
am c84fe3eb: am f3c16a12: Merge "Reduce gradients textures size whenever possible" into jb-mr1-dev
...
* commit 'c84fe3eb09a2fe0112a4f5e1aaa6218036c03c01':
Reduce gradients textures size whenever possible
2012-08-08 16:12:06 -07:00
Adam Powell
32d1079362
am 591a708e: am 08532ab9: Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev
...
* commit '591a708ea06acc1cdb017fb00e04118eceabc85a':
Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement
2012-08-08 16:10:22 -07:00
Romain Guy
c84fe3eb09
am f3c16a12: Merge "Reduce gradients textures size whenever possible" into jb-mr1-dev
...
* commit 'f3c16a12aa0408a69ff358843d020f9ff6b883f1':
Reduce gradients textures size whenever possible
2012-08-08 16:09:16 -07:00
Adam Powell
591a708ea0
am 08532ab9: Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev
...
* commit '08532ab9ba073c217e39272db00740d75f00248a':
Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement
2012-08-08 16:07:33 -07:00
Romain Guy
f3c16a12aa
Merge "Reduce gradients textures size whenever possible" into jb-mr1-dev
2012-08-08 16:06:37 -07:00
Romain Guy
320d46bf84
Reduce gradients textures size whenever possible
...
Change-Id: Ifd58625ee62edac3b5d20b77553cb98b6fa2b46e
2012-08-08 16:05:42 -07:00
Adam Powell
08532ab9ba
Merge "Fix indeterminate ProgressBars with weird sizes and padding; optimize ActionBar measurement" into jb-mr1-dev
2012-08-08 16:04:35 -07:00
Adam Powell
6322af54cf
Fix indeterminate ProgressBars with weird sizes and padding; optimize
...
ActionBar measurement
Fix a bug where preserved aspect ratios in ProgressBar indeterminate
drawables were causing drawable bounds to be calculated incorrectly
when the ProgressBar had padding specified.
Measure the ActionBar menu view's height with EXACT measure mode,
preventing an extra measure pass to match child heights for some
cases.
Change-Id: I8c4678662a015b57ba2686d5b5c5fc27d4ef8d36
2012-08-08 16:02:36 -07:00
Nick Kralevich
a30a4806ac
PackageParser: remove temporary code.
...
This code isn't needed and wasn't doing what I thought
it was doing.
Bug: 3306452
Change-Id: Ifeab672e379fd331a6f0ef1504eebb29aa6b4466
2012-08-08 15:39:45 -07:00
Romain Guy
b1ab6e0dfe
am 091b5171: am c89b14bb: It seems that apparently useless public APIs are actually useful Bug #6953651
...
* commit '091b5171397c6fd4296eb61001e0fcf1e67ade08':
It seems that apparently useless public APIs are actually useful Bug #6953651
2012-08-08 15:12:09 -07:00
Kenny Root
3572d505fd
am 3d1235a5: am 6ab4511a: Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev
...
* commit '3d1235a51bd2e63b81bfa5c89e99ab95e253090d':
Use TrustedCertificateStore for chain building
2012-08-08 15:12:01 -07:00
Subir Jhanb
015d0b3e7f
am 95c29a8b: am 603af61a: Add a new permission to have access to Gal Provider BUG:6897999
...
* commit '95c29a8bbcf31c196044d6b645119d67b2c36e9f':
Add a new permission to have access to Gal Provider BUG:6897999
2012-08-08 15:11:53 -07:00
Jean-Baptiste Queru
5d1e814e75
am c366e198: am 9951b7c4: am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit 'c366e198238cc03ab6a857e339035ecd8a09fc25':
Return early when checking divider before child zero.
2012-08-08 15:11:43 -07:00
Jean-Baptiste Queru
839e76d7de
am 1cc9386e: am 88a42921: am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '1cc9386e96e676b3a84f4ce058d2fab86c662a13':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 15:11:39 -07:00
Jean-Baptiste Queru
8c8a75c204
am 9039f65c: am b6039811: am 05e97e81: am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case"
...
* commit '9039f65ca265494c53f13f4355e8323866d9faf7':
Add shortcut to avoid potential divide by zero in some case
2012-08-08 15:11:35 -07:00
Rich Cannings
b38cb4da4a
am 22c5c52d: am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
...
* commit '22c5c52d43d055db307e6a0136180e7995db49f1':
Revert "Pass URLs to package verifiers"
2012-08-08 15:11:15 -07:00
John Grossman
e5394f85a6
am ae839035: am f007bd3c: common_time: Fix a small build warning.
...
* commit 'ae839035c11180fefaee523b36257f374ab41419':
common_time: Fix a small build warning.
2012-08-08 15:11:06 -07:00
Jason Simmons
6db52cd09f
am b2977a45: am 5017f232: Call systemReady on the lock settings before doing so on the window manager
...
* commit 'b2977a45f62906cbb1b78c3c236ecdc9483753f7':
Call systemReady on the lock settings before doing so on the window manager
2012-08-08 15:11:02 -07:00
Jean-Baptiste Queru
2c4f62672f
am a2848806: am 86d09388: am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit 'a2848806a746abf34e7a0e140a0ac21bef360fa2':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 15:10:59 -07:00
Jean-Baptiste Queru
314458c08b
am d81486d2: am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit 'd81486d208062b188ce9be198f362bc69eb0c149':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 15:10:55 -07:00
Jean-Baptiste Queru
04c7088a95
am f2fc4204: am 1bcc24d1: am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
...
* commit 'f2fc4204b06ca8d8bdd28ddf64bb9af4db9adf1f':
mediacodec: Don't suggest calling getOutputFormat() immediately
2012-08-08 15:10:52 -07:00
Romain Guy
091b517139
am c89b14bb: It seems that apparently useless public APIs are actually useful Bug #6953651
...
* commit 'c89b14bba0f6cc2c91629080617f7ed215f697f3':
It seems that apparently useless public APIs are actually useful Bug #6953651
2012-08-08 15:01:43 -07:00
Romain Guy
c89b14bba0
It seems that apparently useless public APIs are actually useful
...
Bug #6953651
Change-Id: Ic47ce504e63262711f5d3edc76f7d2b9c12471ad
2012-08-08 14:58:54 -07:00
Kenny Root
3d1235a51b
am 6ab4511a: Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev
...
* commit '6ab4511aa61f48cd2b4fe0444077d78cd404bab7':
Use TrustedCertificateStore for chain building
2012-08-08 14:50:59 -07:00
Kenny Root
6ab4511aa6
Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev
2012-08-08 14:49:30 -07:00
Subir Jhanb
95c29a8bbc
am 603af61a: Add a new permission to have access to Gal Provider BUG:6897999
...
* commit '603af61a7cd49f214743b286520419a3fe460774':
Add a new permission to have access to Gal Provider BUG:6897999
2012-08-08 14:37:42 -07:00
Subir Jhanb
603af61a7c
Add a new permission to have access to Gal Provider
...
BUG:6897999
Change-Id: Ie60963b7f3911b402b971e794178754e1b4f0a43
2012-08-08 14:31:45 -07:00
Jean-Baptiste Queru
c366e19823
am 9951b7c4: am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit '9951b7c4f094d39db70626ed665f848971220c48':
Return early when checking divider before child zero.
2012-08-08 14:10:57 -07:00
Jean-Baptiste Queru
1cc9386e96
am 88a42921: am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '88a4292186fef902db476d63529d0b15a17d9d4d':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:10:53 -07:00
Jean-Baptiste Queru
9039f65ca2
am b6039811: am 05e97e81: am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case"
...
* commit 'b6039811fa0fbc23f25c47491810faeb04ce3125':
Add shortcut to avoid potential divide by zero in some case
2012-08-08 14:10:50 -07:00
Jean-Baptiste Queru
9951b7c4f0
am e5c46fae: am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit 'e5c46faefb9deda885cff308ec9b1926636ca8bc':
Return early when checking divider before child zero.
2012-08-08 14:08:42 -07:00
Jean-Baptiste Queru
88a4292186
am 807c7ae0: am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '807c7ae00bc5b8a7fe68ba4acbfa3909a955ae70':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:08:38 -07:00
Jean-Baptiste Queru
b6039811fa
am 05e97e81: am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case"
...
* commit '05e97e81a5fa2c9cab4cdda15aa2d036243a0c0e':
Add shortcut to avoid potential divide by zero in some case
2012-08-08 14:08:35 -07:00
Jean-Baptiste Queru
e5c46faefb
am 6d0dd51e: Merge "Return early when checking divider before child zero."
...
* commit '6d0dd51ebb170a89bea614a558b96f1dff3e7723':
Return early when checking divider before child zero.
2012-08-08 14:04:08 -07:00
Jean-Baptiste Queru
807c7ae00b
am 7835d4fb: Merge "Fix SurfaceView notifies on invalid surfaces."
...
* commit '7835d4fb4e99bac698599a269ce7f84f2de1fb46':
Fix SurfaceView notifies on invalid surfaces.
2012-08-08 14:04:02 -07:00
Jean-Baptiste Queru
05e97e81a5
am 0be33f2d: Merge "Add shortcut to avoid potential divide by zero in some case"
...
* commit '0be33f2d522f76f48062a59ddb520815a0851875':
Add shortcut to avoid potential divide by zero in some case
2012-08-08 14:03:58 -07:00
Rich Cannings
22c5c52d43
am a56d9cec: Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
...
* commit 'a56d9cecee8a34e0554770ac6253dd3a76b9199c':
Revert "Pass URLs to package verifiers"
2012-08-08 13:53:27 -07:00