Baligh Uddin
b7649306e9
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-08-08 20:43:29 -07:00
Jeff Brown
a130046733
Merge "Enable use of Surface as a native window in EGL14 wrapper." into jb-mr1-dev
2012-08-08 18:41:05 -07:00
Jeff Brown
1670dc9abf
Merge "Add FloatMath.exp." into jb-mr1-dev
2012-08-08 18:29:08 -07:00
Jeff Brown
1296c63bf1
Enable use of Surface as a native window in EGL14 wrapper.
...
Change-Id: Ia3546fd02f9b60d4505fbc0602522b95e3e5b6be
2012-08-08 18:23:59 -07:00
Jeff Brown
5d728bb9ff
Add FloatMath.exp.
...
Change-Id: I7f215e5fd4cb942ddee56eebaef04be565ac79f3
2012-08-08 18:23:53 -07:00
Jeff Brown
b7df3a714f
Merge "Make display info accessible from hidden api." into jb-mr1-dev
2012-08-08 18:21:27 -07:00
Wink Saville
f08755705f
am eb2257cc: am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"
...
* commit 'eb2257ccc94679404cf22d876f0a98109a5dc25d':
Telephony: Dynamically instantiate IccCard
2012-08-08 17:44:24 -07:00
Nick Kralevich
5a28605155
Merge "PackageParser: remove temporary code." into jb-mr1-dev
2012-08-08 17:19:06 -07:00
Wink Saville
eb2257ccc9
am 6f2361e7: Merge "Telephony: Dynamically instantiate IccCard"
...
* commit '6f2361e7a97329feba7ac19b1a2635e315f73021':
Telephony: Dynamically instantiate IccCard
2012-08-08 17:09:26 -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
Wink Saville
6f2361e7a9
Merge "Telephony: Dynamically instantiate IccCard"
2012-08-08 16:36:34 -07:00
Jeff Sharkey
fb11ffa2a0
Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev
2012-08-08 16:25:41 -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
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
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
6ab4511aa6
Merge "Use TrustedCertificateStore for chain building" into jb-mr1-dev
2012-08-08 14:49:30 -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
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
a56d9cecee
Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev
2012-08-08 13:50:56 -07:00
Jean-Baptiste Queru
6d0dd51ebb
Merge "Return early when checking divider before child zero."
2012-08-08 13:20:07 -07:00
Jean-Baptiste Queru
7835d4fb4e
Merge "Fix SurfaceView notifies on invalid surfaces."
2012-08-08 13:20:00 -07:00
Jean-Baptiste Queru
0be33f2d52
Merge "Add shortcut to avoid potential divide by zero in some case"
2012-08-08 13:17:26 -07:00
John Grossman
f007bd3cf8
common_time: Fix a small build warning.
...
(cherry picked from commit f19c7a64a5c35dcc684708fc56e5cbd2a4997c4b)
> common_time: Fix a small build warning.
>
> Change-Id: I9a3652c8191ec86089117dbe6c16ff8612a911a3
> Signed-off-by: John Grossman <johngro@google.com>
Change-Id: I9d04f457d8a7f45249c86c4ad69bfd71fdd77245
Signed-off-by: John Grossman <johngro@google.com>
2012-08-08 13:15:45 -07:00
Jason Simmons
5017f23284
Call systemReady on the lock settings before doing so on the window manager
...
At systemReady time, the window manager needs to obtain values from the lock
settings service (e.g. whether the lock screen is disabled). During the
initial boot of a wiped device, the window manager was getting the wrong
values because LockSettingsService.systemReady/migrateOldData had not yet been
called.
Change-Id: I60825d0e4fad53a5b4349dabf9e5e299b863d0d0
(cherry pick of 2458abaf6676d5015af733c1010ecd67a085e9e2 from jb-aah-dev)
2012-08-08 13:15:00 -07:00
Jean-Baptiste Queru
86d09388ee
am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit 'bce413587973eae29a783d7e273dc2f7db06f7c9':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:11:33 -07:00
Jean-Baptiste Queru
04c7923c74
am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '749135722c6edb681fc27fcbab5beba25f938d82':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:11:28 -07:00
Jean-Baptiste Queru
1bcc24d123
am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
...
* commit '6736cca08df84328913962f9a14fafa13a25d390':
mediacodec: Don't suggest calling getOutputFormat() immediately
2012-08-08 13:11:24 -07:00
Jean-Baptiste Queru
bce4135879
am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount"
...
* commit '9ab84c203fea0521135e0b0983aa15ce1afdc5ec':
Fix wrong count return for getPhoneSignalStrengthCount
2012-08-08 13:08:31 -07:00
Jean-Baptiste Queru
749135722c
am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
...
* commit '6fb8fe9aba75681509d84f68d536ed78d292bd44':
StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
2012-08-08 13:08:27 -07:00
Jean-Baptiste Queru
6736cca08d
am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately"
...
* commit '52410be8ec092bfa7e84f2d8facdc161d6107ac3':
mediacodec: Don't suggest calling getOutputFormat() immediately
2012-08-08 13:08:21 -07:00
Jean-Baptiste Queru
9ab84c203f
Merge "Fix wrong count return for getPhoneSignalStrengthCount"
2012-08-08 12:59:06 -07:00
Rich Cannings
e1d7c711df
Revert "Pass URLs to package verifiers"
...
This reverts commit 24713907fe4632d263aea82f7a35c8fb08918a09
Change-Id: Ie04ba73475b813635c4a74915c45e83250801b6b
2012-08-08 12:46:06 -07:00
Katie McCormick
a7f86bf6c2
am be3d2cf1: am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
...
* commit 'be3d2cf10b79ebee5455854823ff6947dc919d8e':
cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
2012-08-08 12:16:14 -07:00
Katie McCormick
be3d2cf10b
am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
...
* commit '2f8cc17f5fbc2e05ac0889fbbddf4e530750087b':
cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
2012-08-08 12:14:24 -07:00
Jean-Baptiste Queru
6fb8fe9aba
Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"
2012-08-08 12:06:26 -07:00
Jean-Baptiste Queru
52410be8ec
Merge "mediacodec: Don't suggest calling getOutputFormat() immediately"
2012-08-08 12:06:03 -07:00
Jean-Baptiste Queru
c386ee56b9
am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree"
...
* commit 'c1c55afb474dd85a6205bc8ab94065f3ac38aa77':
Normalize output from aapt d xmltree
2012-08-08 12:03:43 -07:00
Jean-Baptiste Queru
c1c55afb47
am e67f8c8c: Merge "Normalize output from aapt d xmltree"
...
* commit 'e67f8c8c279e20fff5f426eccd062b709e6280ed':
Normalize output from aapt d xmltree
2012-08-08 12:01:35 -07:00
James Dong
aef4af4cd1
Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev
2012-08-08 11:38:05 -07:00
Baligh Uddin
36d60383c1
Import translations. DO NOT MERGE
...
Change-Id: Id596c71fef96c4ca0b23bdabcba326171d625ab5
Auto-generated-cl: translation import
2012-08-08 11:34:09 -07:00