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

83132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Rich Cannings
a56d9cecee Merge "Revert "Pass URLs to package verifiers"" into jb-mr1-dev 2012-08-08 13:50:56 -07:00
John Grossman
ae839035c1 am f007bd3c: common_time: Fix a small build warning. 
* commit 'f007bd3cf8cacd75287781c1bb37fe4167c79cba':
  common_time: Fix a small build warning.
 2012-08-08 13:23:05 -07:00
Jason Simmons
b2977a45f6 am 5017f232: Call systemReady on the lock settings before doing so on the window manager 
* commit '5017f2328407447002ab2d0cae1fe8ef87c50501':
  Call systemReady on the lock settings before doing so on the window manager
 2012-08-08 13:22:59 -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
a2848806a7 am 86d09388: am bce41358: am 9ab84c20: Merge "Fix wrong count return for getPhoneSignalStrengthCount" 
* commit '86d09388ee1b98513de40dfff5de6e7c3b24cc07':
  Fix wrong count return for getPhoneSignalStrengthCount
 2012-08-08 13:13:45 -07:00
Jean-Baptiste Queru
d81486d208 am 04c7923c: am 74913572: am 6fb8fe9a: Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)" 
* commit '04c7923c74eca791d1bea853b9ac246af2ad3db0':
  StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)
 2012-08-08 13:13:41 -07:00
Jean-Baptiste Queru
f2fc4204b0 am 1bcc24d1: am 6736cca0: am 52410be8: Merge "mediacodec: Don\'t suggest calling getOutputFormat() immediately" 
* commit '1bcc24d123f8f319d7f5af06d9c30a056d709ede':
  mediacodec: Don't suggest calling getOutputFormat() immediately
 2012-08-08 13:13:38 -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
a8d804d4d3 am b25382c8: am a7f86bf6: am be3d2cf1: am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit 'b25382c8812b123523ddd066722b3ae32b0c562f':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:20:42 -07:00
Katie McCormick
b25382c881 am a7f86bf6: am be3d2cf1: am 2f8cc17f: cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
* commit 'a7f86bf6c2605fc32ddafcd33d5d8d775d549627':
  cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2
 2012-08-08 12:18:07 -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
dbba825302 am 41aa4608: am c386ee56: am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit '41aa460860c5197ee10435a523a10b43961f0e42':
  Normalize output from aapt d xmltree
 2012-08-08 12:06:54 -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
41aa460860 am c386ee56: am c1c55afb: am e67f8c8c: Merge "Normalize output from aapt d xmltree" 
* commit 'c386ee56b995ec6562c4a20238ace2297562834b':
  Normalize output from aapt d xmltree
 2012-08-08 12:05:17 -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
ca5a689d5a am da1007d1: am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev 
* commit 'da1007d15114311816cb17b15fa662759d194643':
  Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class
 2012-08-08 11:42:08 -07:00
Nick Kralevich
af0d0aae27 am 1ce2a926: am 2caec6c6: Fix link typo. 
* commit '1ce2a926ea6af2e0b7c2b7e34aa5dca69592290e':
  Fix link typo.
 2012-08-08 11:40:26 -07:00
James Dong
da1007d151 am aef4af4c: Merge "Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class" into jb-mr1-dev 
* commit 'aef4af4cd122ca5713110ccc7539828ce6e2f642':
  Add MEDIA_ERROR_SERVER_DIED error constant to MediaRecorder.java class
 2012-08-08 11:39:37 -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
Nick Kralevich
1ce2a926ea am 2caec6c6: Fix link typo. 
* commit '2caec6c682853ccbfe73ef5ae15c1d03ea043e8a':
  Fix link typo.
 2012-08-08 11:37:59 -07:00
Nick Kralevich
2caec6c682 Fix link typo. 
Change-Id: I182b9c04caddcc4a985f206eddf5c23b06afe0e3
 2012-08-08 11:33:17 -07:00
Katie McCormick
2f8cc17f5f cherrypick from ics-mr1 docs: source for nw app Change-Id: If50f407a0e56fa802fe9beedaa650e3a131872b2 
Change-Id: I55d8668f4065129c844ada239f268a6621df4780
 2012-08-08 11:27:09 -07:00
Jean-Baptiste Queru
e67f8c8c27 Merge "Normalize output from aapt d xmltree" 2012-08-08 11:21:29 -07:00
Jean-Baptiste Queru
f9f3fe9709 am 487e079b: am de9d40d4: am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak" 
* commit '487e079b6ac2a0f58f1ed3fc7d21343c299e7403':
  Fix cursor memory leak
 2012-08-08 10:59:50 -07:00
Jean-Baptiste Queru
7ebe1bfff5 am aa02a15d: am c98db2a7: am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit 'aa02a15d42155161593f177cfeba75763331d08d':
  Adds missing Bluetooth as network type.
 2012-08-08 10:59:46 -07:00
Jean-Baptiste Queru
487e079b6a am de9d40d4: am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak" 
* commit 'de9d40d445eb7e095ef1f988bf24695da525c772':
  Fix cursor memory leak
 2012-08-08 10:58:18 -07:00
Jean-Baptiste Queru
aa02a15d42 am c98db2a7: am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit 'c98db2a7d1379eacef17029e03f1ff4532f32f0a':
  Adds missing Bluetooth as network type.
 2012-08-08 10:58:15 -07:00
Jean-Baptiste Queru
de9d40d445 am 64ed6b2c: am d77d17c2: Merge "Fix cursor memory leak" 
* commit '64ed6b2cfa6a4bb58f3f8a9b59d840cdce049c80':
  Fix cursor memory leak
 2012-08-08 10:55:46 -07:00
Jean-Baptiste Queru
c98db2a7d1 am 425d13a0: am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit '425d13a0aeded1f750addb2c64cd693109661415':
  Adds missing Bluetooth as network type.
 2012-08-08 10:55:39 -07:00
Nick Kralevich
9663215edc am ebd997d8: am 9d16c219: Merge "Content Providers: change default for android:exported" into jb-mr1-dev 
* commit 'ebd997d8662e52a64318b1f3c531d61e6e76bfc3':
  Content Providers: change default for android:exported
 2012-08-08 10:54:26 -07:00
Jean-Baptiste Queru
64ed6b2cfa am d77d17c2: Merge "Fix cursor memory leak" 
* commit 'd77d17c28d6f120ceb648747c7e2ef1a50215700':
  Fix cursor memory leak
 2012-08-08 10:54:04 -07:00
Jean-Baptiste Queru
425d13a0ae am 2278e60c: Merge "Adds missing Bluetooth as network type." 
* commit '2278e60c39f937b6eee14fbf0094d4be92d7f06b':
  Adds missing Bluetooth as network type.
 2012-08-08 10:53:52 -07:00