Zhentao Sun
04375db653
am c5fc9988: Made it easier to disable overlay mechanism of location components.
...
* commit 'c5fc9988f11acc58229fb6ae80d346277318ada4':
Made it easier to disable overlay mechanism of location components.
2013-04-23 03:50:20 -07:00
Zhentao Sun
c5fc9988f1
Made it easier to disable overlay mechanism of location components.
...
Fixed b/8276827
Vendor might want to provide their own implementation of "network
location", "fused location" and "geocoder" service. Location manager now
allows those service to be replaced by packages that have the same
signature as one of the packages in config_locationProviderPackageNames.
Such behavior might not be desirable on some devices. This change
make this behavior configurable by 3 boolean flags.
Details:
- Added three boolean flags in core/res/res/values/config.xml to enable
or disable NLP/FLP/Geocoder overlay
- Added 3 package name for the stock NLP/FLP/Geocoder. They are needed
only when overlay is disabled because LocationManagerService need to
know which package is preferred when searching for
NLP/FLP/Geocoder service.
- Made ServiceWatcher able to handle non-overlayable services.
- Fixed an NPE isue in ServiceWatcher. mPm.queryIntentServicesAsUser
might return null.
- Fixed an bug: justCheckThisPackage in bindBestPackageLocked is always
ignored.
Change-Id: Id221961ac7c3aa8ad44b894f9523f04f770ae237
2013-04-22 10:02:08 -07:00
Michael Wright
076e1f4c56
am abc2763e: Merge "KeyEvent: update comment"
...
* commit 'abc2763e4587c3326d160f25666e933cc6888884':
KeyEvent: update comment
2013-04-20 22:43:56 -07:00
Michael Wright
abc2763e45
Merge "KeyEvent: update comment"
2013-04-21 05:34:28 +00:00
Chet Haase
371d4cccde
am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
...
* commit '339ac85483145972da010ad34cbcb29ed70cb822':
Fix quickReject logic to account for setClipChildren() setting
2013-04-20 21:34:59 -07:00
Dirk Dougherty
0b97c8cd0f
am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit '16f654c963890e0ed134560a20f2a481ae4fc7d9':
Doc change: updates for tablet checklist.
2013-04-20 21:34:55 -07:00
Selim Gurun
bf67c6bbd9
am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit 'b2d82bc0ab0f201443a768e6a8b1636da370c690':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 21:34:55 -07:00
Selim Gurun
20113c0b4d
am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '940718d8598e4b8da3009b46e8edba9d1dc6ed40':
Revert "Add a delimiter between scheme and host"
2013-04-20 21:34:55 -07:00
Geremy Condra
0052e7899f
am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '5f49fd866105cd8d5e7355d40d1268f4cc121ef7':
Add a delimiter between scheme and host
2013-04-20 21:34:54 -07:00
Stephen Hines
4a84af896c
am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev
...
* commit 'b322f99476574546cad638ed8e2866ec106d51fc':
Add new error code for Debug Context work.
2013-04-20 21:34:54 -07:00
Jeff Brown
e215571284
am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
...
* commit 'a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
Revert all recent GLSurfaceView changes.
2013-04-20 21:34:53 -07:00
Fabrice Di Meglio
b241f60fe7
am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
...
* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
2013-04-20 21:34:53 -07:00
Kenny Root
0f70770be8
am b5ec8c14: Change doc comment to match API change
...
* commit 'b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
Change doc comment to match API change
2013-04-20 21:34:52 -07:00
Christopher Tate
353bd75bba
am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
...
* commit '18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
Provide SharedPreferences coherence guarantees for BackupAgent
2013-04-20 21:34:52 -07:00
Victoria Lease
7e170b6321
am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
...
* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
do not attempt to parcel unknown ParcelableSpans
2013-04-20 21:34:52 -07:00
Dianne Hackborn
5b00f5584a
am b3bffa80: Merge "Follow up on issue #8159072 : Spinner widget should be RTL\'ized" into jb-mr2-dev
...
* commit 'b3bffa8080c4b04285897d18f913cf6385b0e9e1':
Follow up on issue #8159072 : Spinner widget should be RTL'ized
2013-04-20 21:34:51 -07:00
Craig Mautner
70f30d217c
am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
...
* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
Improve javadoc for rotationAnimation.
2013-04-20 21:34:51 -07:00
Chet Haase
339ac85483
Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
2013-04-20 21:02:21 +00:00
Dirk Dougherty
16f654c963
am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit 'f4f5757b68e3b0db10c77ac9fa81d6b4d7dd8435':
Doc change: updates for tablet checklist.
2013-04-20 12:11:49 -07:00
Dirk Dougherty
f4f5757b68
am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit '014513ae2974edd2e6102f618ca57423c543cb4f':
Doc change: updates for tablet checklist.
2013-04-20 12:09:42 -07:00
Dirk Dougherty
014513ae29
am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit '00d20bd293e75beb546ea446901cdead39180116':
Doc change: updates for tablet checklist.
2013-04-20 12:08:04 -07:00
Dirk Dougherty
00d20bd293
am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit 'e0d5add782405fabe4d04b8eff00b565ea28a35f':
Doc change: updates for tablet checklist.
2013-04-20 12:05:45 -07:00
Dirk Dougherty
e0d5add782
am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit '3fd1a8926ebfaaeccbaad86b7584fa534f725996':
Doc change: updates for tablet checklist.
2013-04-20 12:03:37 -07:00
Dirk Dougherty
3fd1a8926e
am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
...
* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
Doc change: updates for tablet checklist.
2013-04-20 12:01:29 -07:00
Dirk Dougherty
94ca86e8a0
Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
2013-04-20 18:59:02 +00:00
Dirk Dougherty
7006b7fbc6
Doc change: updates for tablet checklist.
...
Change-Id: I0339c0d3853467da435654940d0c55a31139b736
2013-04-20 11:34:51 -07:00
Selim Gurun
b2d82bc0ab
am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '8695b1aff8b4ece642796ba7b2a5faa2b8a87d60':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:38:34 -07:00
Selim Gurun
940718d859
am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:38:31 -07:00
Selim Gurun
8695b1aff8
am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '5eebdb4aa81f9e00e5f175bbebfec76cbde5b38d':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:35:32 -07:00
Selim Gurun
a68545796d
am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:35:29 -07:00
Selim Gurun
5eebdb4aa8
am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:32:27 -07:00
Selim Gurun
fa1f7d21e9
am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:32:24 -07:00
Selim Gurun
a46537270e
am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '25e150a2dd60a624ceecd5a5743a622fed32ef90':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:28:40 -07:00
Selim Gurun
07c9c2912d
am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit 'a2b0b35ed8f5c53866058f65ccf8c6e4aabef7af':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:28:37 -07:00
Selim Gurun
25e150a2dd
am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit 'a6ca0a6b2662e06cefcdbb5eb763e79f9b798018':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:25:09 -07:00
Selim Gurun
a2b0b35ed8
am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '5fba3404d3635fdd6bba9ba2fe7605851f07263f':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:25:06 -07:00
Selim Gurun
a6ca0a6b26
am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '758dfa0c33c022ab3cdeb854ab507ad218d7fa3d':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:22:04 -07:00
Selim Gurun
5fba3404d3
am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '3c4fa654801fcf51a92cefd62e28a020d39e08d0':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:22:01 -07:00
Selim Gurun
758dfa0c33
am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
...
* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
DO NOT MERGE Add a delimiter between scheme and host
2013-04-20 00:19:45 -07:00
Selim Gurun
3c4fa65480
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
...
* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
Revert "Add a delimiter between scheme and host"
2013-04-20 00:19:41 -07:00
Geremy Condra
5f49fd8661
am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '464be7975fa8938d7ab427789faa5e222bc6ab2c':
Add a delimiter between scheme and host
2013-04-19 23:59:00 -07:00
Geremy Condra
464be7975f
am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '30504327364a7ad641c09a227f7930b9fba91614':
Add a delimiter between scheme and host
2013-04-19 23:19:20 -07:00
Geremy Condra
3050432736
am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '62588d794602f6e42e8143169d8ef170589797a1':
Add a delimiter between scheme and host
2013-04-19 23:17:45 -07:00
Geremy Condra
62588d7946
am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit '8f87c5d8d270bbc23738aea067b1bce2b7d08d02':
Add a delimiter between scheme and host
2013-04-19 23:14:38 -07:00
Geremy Condra
8f87c5d8d2
am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit 'ed1e5a8702b172298b25937b9feb0da08804d440':
Add a delimiter between scheme and host
2013-04-19 23:12:10 -07:00
Stephen Hines
b322f99476
Merge "Add new error code for Debug Context work." into jb-mr2-dev
2013-04-20 04:48:18 +00:00
Geremy Condra
ed1e5a8702
am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
...
* commit 'b7787a317fc8bb163de04641a1423cd08324d4b8':
Add a delimiter between scheme and host
2013-04-19 21:38:06 -07:00
Jeff Brown
a937b8cb33
Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
2013-04-20 00:55:48 +00:00
Fabrice Di Meglio
c3d0a81a4a
Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
2013-04-20 00:42:19 +00:00
Fabrice Di Meglio
8c08fc9a86
Fix bug #8656546 API REVIEW: android.text.bidi / android.text
...
- clean BidiFormatter APIs
Change-Id: I8591ce3c3e8f2de4138698aa14ddb38b933de5e1
2013-04-19 17:34:01 -07:00