OSDN Git Service
Nick Kralevich [Sat, 25 Apr 2015 22:05:25 +0000 (22:05 +0000)]
am
05ad674a: am
00e165ae: am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
05ad674aa888e3f9217de0e5c3176161dd8e31aa':
fix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 21:56:56 +0000 (21:56 +0000)]
am
00e165ae: am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
00e165aed3d53b147b153003b3b9fd3c129ff3c4':
fix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 21:41:52 +0000 (21:41 +0000)]
am
e8101c04: Merge "fix compiler error under FORTIFY_SOURCE=2"
* commit '
e8101c047cffc69245493d96f2f2ec36728682f1':
fix compiler error under FORTIFY_SOURCE=2
Nick Kralevich [Sat, 25 Apr 2015 21:22:31 +0000 (21:22 +0000)]
Merge "fix compiler error under FORTIFY_SOURCE=2"
Andreas Gampe [Sat, 25 Apr 2015 20:16:09 +0000 (20:16 +0000)]
Merge "Frameworks/base: Fix a constructor"
Geoff Mendal [Sat, 25 Apr 2015 09:28:09 +0000 (09:28 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:16:31 +0000 (09:16 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 09:12:37 +0000 (09:12 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Sat, 25 Apr 2015 08:55:11 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1b40f02313d2014862d8eafd30cdff02255c9564
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 07:23:36 +0000 (00:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id8f27460d1cbdb97a9843a21d531f0b03ab72505
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 06:58:45 +0000 (23:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic375b06aab79b9b7d17754eba4dd9d182a669734
Auto-generated-cl: translation import
Geoff Mendal [Sat, 25 Apr 2015 06:44:04 +0000 (23:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I79db3fdb8e2c5e86259a6c5cefe5e0790a07bc92
Auto-generated-cl: translation import
Nick Kralevich [Sat, 25 Apr 2015 03:25:50 +0000 (20:25 -0700)]
fix compiler error under FORTIFY_SOURCE=2
frameworks/base/libs/androidfw/ObbFile.cpp:340:5: error: ignoring return value of function declared with warn_unused_result attribute [-Werror,-Wunused-result]
ftruncate(fd, mFooterStart);
^~~~~~~~~ ~~~~~~~~~~~~~~~~
1 error generated.
amake: *** [out/host/linux-x86/obj/STATIC_LIBRARIES/libandroidfw_intermediates/ObbFile.o] Error 1
Change-Id: I7080d64e7a830a10b41c1ebf33c60d32b7c8356e
Selim Cinek [Sat, 25 Apr 2015 02:12:51 +0000 (02:12 +0000)]
Merge "Improve the falsing logic for unlock motion"
Selim Cinek [Sat, 25 Apr 2015 01:54:30 +0000 (18:54 -0700)]
Improve the falsing logic for unlock motion
Bug:
20563134
Change-Id: I628829915ad2cc7f1df5d0c971def44f6eacdae4
Etan Cohen [Sat, 25 Apr 2015 01:44:26 +0000 (01:44 +0000)]
Merge "Doc fix - incorrect format (included argument) for function reference."
Etan Cohen [Sat, 25 Apr 2015 01:43:41 +0000 (18:43 -0700)]
Doc fix - incorrect format (included argument) for function reference.
Change-Id: I2cdf7b4f078b1ab0556fcc3fad5287f86641c396
Aravind Akella [Sat, 25 Apr 2015 01:40:25 +0000 (01:40 +0000)]
Merge "Add hidden SensorManager APIs for injecting sensor data."
Andy Hung [Sat, 25 Apr 2015 01:28:41 +0000 (01:28 +0000)]
Merge "Hide stretch mode from PlaybackSettings"
Adam Lesinski [Sat, 25 Apr 2015 01:20:59 +0000 (01:20 +0000)]
Merge "Properly mangle file names"
Julia Reynolds [Sat, 25 Apr 2015 01:09:24 +0000 (01:09 +0000)]
Merge "Only skip unrecognized tags."
Etan Cohen [Sat, 25 Apr 2015 01:08:10 +0000 (01:08 +0000)]
Merge "Fix documentation - non-public API."
Etan Cohen [Sat, 25 Apr 2015 01:06:59 +0000 (18:06 -0700)]
Fix documentation - non-public API.
Change-Id: I418bf47b197936b2f50b231425312d5b6d272df8
Jeff Sharkey [Sat, 25 Apr 2015 01:03:06 +0000 (01:03 +0000)]
Merge "Migrate primary external storage."
Jeff Sharkey [Fri, 24 Apr 2015 23:10:32 +0000 (16:10 -0700)]
Migrate primary external storage.
Wire up through MountService to call down into vold. Watch for
unsolicited events that report progress, including special value "82"
that signals that copy has finished. We use this value to persist
the volumeUuid in case of unexpected reboot, since it indicates the
new volume is ready.
Wire progress updates through existing callback pipeline.
Update the volume mounting code to match against the persisted UUID
when selecting the primary external storage.
Bug:
19993667
Change-Id: Id46957610fb43517bbfbc368f29b7d430664590d
Etan Cohen [Sat, 25 Apr 2015 00:49:40 +0000 (00:49 +0000)]
Merge changes from topic 'mwd-merge-042415'
* changes:
Rename removeVideoCallListener to unregisterCallback
Bluetooth document fix: remove reference from open API to hidden entities
Fix build due to merge of
7595842 and renaming due to
8eb87f0
Merge commit '
052a0da' into merge2
Merge commit '
db1dbb8' into merge2
Merge commit '
7e5e791' into merge2
Merge commit '
170102d' into merge2
Merge commit '
4cb5d80' into merge2
Merge commit '
83cda00' into merge2
Merge commit '
c91bc62' into merge2
Merge commit '
cffc360' into merge2
Merge commit '
7f61051' into merge2
Merge commit '
167c3a7' into merge2
Merge commit '
4467b98' into merge2
Merge commit '
25a217c' into merge2
Merge commit '
04b18ec' into merge2
Merge commit '
7595842' into merge2
Merge commit '
2bbd2b6' into merge2
Merge commit '
4890351' into merge2
Merge commit '
cd405fe' into merge2
Merge commit '
6ddbb5e' into merge2
Merge commit '
de93575' into merge2
Merge commit '
9561e74' into merge2
Ruben Brunk [Sat, 25 Apr 2015 00:48:25 +0000 (00:48 +0000)]
Merge "camera: Start/stop preview before clearing surface."
Andy Hung [Sat, 25 Apr 2015 00:32:57 +0000 (17:32 -0700)]
Hide stretch mode from PlaybackSettings
Different timestretch modes won't be ready for M.
Change-Id: I4fe5ceee5bdf90cb735eb415185812603b5c68a8
Jim Miller [Sat, 25 Apr 2015 00:25:53 +0000 (00:25 +0000)]
Merge "Don't use a WeakReference for fingerprint notification object."
Adrian Roos [Sat, 25 Apr 2015 00:18:21 +0000 (00:18 +0000)]
Merge "Smooth transitions between SHOW_WHEN_LOCKED activities"
Andy Hung [Sat, 25 Apr 2015 00:18:12 +0000 (00:18 +0000)]
Merge "Move channel index computation to native AudioTrack JNI"
Adrian Roos [Fri, 24 Apr 2015 23:03:47 +0000 (16:03 -0700)]
Smooth transitions between SHOW_WHEN_LOCKED activities
Bug:
12536117
Change-Id: Ia5f96e49587661440ae31fba17c42b2e3a9557fb
Jim Miller [Fri, 24 Apr 2015 23:59:11 +0000 (16:59 -0700)]
Don't use a WeakReference for fingerprint notification object.
This was causing a problem where a GC in the system process
would inadvertently remove the callback.
Potential fix for bug
20491119
Change-Id: I9d7d0bb8e29fcd6c52cb3be645bbb9c8e5413d48
Quddus Chong [Fri, 24 Apr 2015 23:53:59 +0000 (23:53 +0000)]
am
6c52d51c: am
bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug:
18025533
* commit '
6c52d51c65613beb23ea135e8a8374f6c2dc1bf8':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug:
18025533
Adam Cohen [Fri, 24 Apr 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Remove problematic early return from notifyDataSetChanged"
Adrian Roos [Fri, 24 Apr 2015 23:43:34 +0000 (23:43 +0000)]
Merge "Fix stale inKeyguardInputRestrictedMode"
Quddus Chong [Fri, 24 Apr 2015 23:43:49 +0000 (23:43 +0000)]
am
bbe5effb: docs: Fixed typo in \'Authorizing with Google for REST APIs\' doc. bug:
18025533
* commit '
bbe5effb6682b4ba5e6accd9a226ec7611fe83dc':
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc. bug:
18025533
Andy Hung [Fri, 24 Apr 2015 23:43:32 +0000 (23:43 +0000)]
Merge "Unhide new channel masks and deprecate old channel masks"
Jae Seo [Fri, 24 Apr 2015 23:41:19 +0000 (23:41 +0000)]
Merge "TIF: Add TvContentRating constant for unrated content"
Amith Yamasani [Fri, 24 Apr 2015 23:39:32 +0000 (23:39 +0000)]
Merge "More usage tracking"
Arunesh Mishra [Fri, 24 Apr 2015 23:29:38 +0000 (23:29 +0000)]
Merge "Add AudioManager property strings for ultrasound."
Quddus Chong [Fri, 24 Apr 2015 23:28:40 +0000 (16:28 -0700)]
docs: Fixed typo in 'Authorizing with Google for REST APIs' doc.
bug:
18025533
Change-Id: I6379b2a7be495a506e0e428fe9c68fdbe197704b
Adam Cohen [Fri, 24 Apr 2015 22:39:45 +0000 (15:39 -0700)]
Remove problematic early return from notifyDataSetChanged
-> If connection to the service fails for whatever reason,
mNotifyDataSetChangedAfterOnServiceConnected can get stuck to true, preventing
future connections to the service. Don't let this prevent from connecting to the
service.
issue
19890339
Change-Id: I376101ae146359109df53add3a3202ba2e1e842d
Amith Yamasani [Fri, 17 Apr 2015 17:02:15 +0000 (10:02 -0700)]
More usage tracking
Notification listeners can now report that a notification
has been seen by the user and that package is then marked
as active.
Bug:
20066058
Change-Id: I336040a52c44c21fd0d78b02ec9a19d448c64b40
Yorke Lee [Fri, 24 Apr 2015 23:11:41 +0000 (23:11 +0000)]
Merge "Add APIs to getDefaultDialerPackage and getSystemDialerPackage"
Andy Hung [Fri, 24 Apr 2015 02:28:38 +0000 (19:28 -0700)]
Move channel index computation to native AudioTrack JNI
Change-Id: I047a9dcce13a38c11da165607d668dfb9d7fa335
Adrian Roos [Fri, 24 Apr 2015 23:04:53 +0000 (16:04 -0700)]
Fix stale inKeyguardInputRestrictedMode
Bug:
20536027
Change-Id: Ica65b388ae2c58a45c66e9f30efa3fadeded8d47
Doris Liu [Fri, 24 Apr 2015 23:04:59 +0000 (23:04 +0000)]
Merge "Remove distance based animation duration API"
Fyodor Kupolov [Fri, 24 Apr 2015 23:02:41 +0000 (23:02 +0000)]
Merge "Added SystemServiceRegistry to preloaded-classes"
Seigo Nonaka [Fri, 24 Apr 2015 22:46:12 +0000 (22:46 +0000)]
Merge "Notify IME visibility when showWindow is called."
Zhijun He [Fri, 24 Apr 2015 22:38:46 +0000 (22:38 +0000)]
Merge "Image: fix build break"
Jens Ole Lauridsen [Fri, 24 Apr 2015 22:37:45 +0000 (22:37 +0000)]
Merge "parcel: Add efficient methods for writing and reading a parcelable."
Wale Ogunwale [Fri, 24 Apr 2015 22:35:34 +0000 (22:35 +0000)]
am
cc9c597d: am
d639a453: am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
cc9c597dad6d99242ed2903d8760922f66223401':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:35:26 +0000 (22:35 +0000)]
am
4cdc7e84: am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
4cdc7e842d8b1ff1e70d2a0b4a2a1939fa116563':
Revert "Clean-up state if we have an exception when acquiring provider"
Zhijun He [Fri, 24 Apr 2015 22:29:21 +0000 (15:29 -0700)]
Image: fix build break
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
Wale Ogunwale [Fri, 24 Apr 2015 22:26:08 +0000 (22:26 +0000)]
am
d639a453: am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
d639a4532417bf605f03b3b5efdb3a9e1cbe6661':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:26:04 +0000 (22:26 +0000)]
am
e2047da6: am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
Revert "Clean-up state if we have an exception when acquiring provider"
Etan Cohen [Fri, 24 Apr 2015 22:16:10 +0000 (15:16 -0700)]
Rename removeVideoCallListener to unregisterCallback
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
Wale Ogunwale [Fri, 24 Apr 2015 22:15:02 +0000 (22:15 +0000)]
am
e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
* commit '
e60077e62a441dbcc132b2abb35d998ab48d261c':
Revert "[ActivityManager] Improve multi-thread access the same provider"
Wale Ogunwale [Fri, 24 Apr 2015 22:14:56 +0000 (22:14 +0000)]
am
d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
* commit '
d9bf26522b930a8d5d25f6e28c390e39fee6d0b2':
Revert "Clean-up state if we have an exception when acquiring provider"
Kenny Root [Fri, 24 Apr 2015 22:13:26 +0000 (22:13 +0000)]
am
6c1af7ea: am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
frameworks/base: switch to using NativeConstants.
Jae Seo [Fri, 24 Apr 2015 22:03:35 +0000 (22:03 +0000)]
Merge "TIF: Use Preconditions.checkNotNull for null checking"
Mike Lockwood [Fri, 24 Apr 2015 22:03:04 +0000 (22:03 +0000)]
Merge "UsbAlsaManager: Fix NPE when running in emulator"
Kenny Root [Fri, 24 Apr 2015 22:00:56 +0000 (22:00 +0000)]
am
8652bce1: am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
8652bce13765fb29329df2a4ccca4591bae28de5':
frameworks/base: switch to using NativeConstants.
Zhijun He [Fri, 24 Apr 2015 21:59:21 +0000 (21:59 +0000)]
Merge "ImageWriter: fix and cleanup the closed Image Handling"
Mike Lockwood [Fri, 24 Apr 2015 21:56:32 +0000 (14:56 -0700)]
UsbAlsaManager: Fix NPE when running in emulator
Bug:
20537358
Change-Id: I46693e45eb6127118cbd54fc3490dc58840b5797
Wale Ogunwale [Fri, 24 Apr 2015 21:49:45 +0000 (21:49 +0000)]
Merge "Revert "[ActivityManager] Improve multi-thread access the same provider""
Kenny Root [Fri, 24 Apr 2015 21:49:47 +0000 (21:49 +0000)]
am
c71f2648: Merge "frameworks/base: switch to using NativeConstants."
* commit '
c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
frameworks/base: switch to using NativeConstants.
Wale Ogunwale [Fri, 24 Apr 2015 21:49:41 +0000 (21:49 +0000)]
Merge "Revert "Clean-up state if we have an exception when acquiring provider""
Lajos Molnar [Fri, 24 Apr 2015 21:40:52 +0000 (14:40 -0700)]
MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed
Bug:
19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
Wei Jia [Fri, 24 Apr 2015 21:46:22 +0000 (21:46 +0000)]
Merge "MediaSync: add OnErrorListener."
Wale Ogunwale [Fri, 24 Apr 2015 21:45:14 +0000 (14:45 -0700)]
Revert "[ActivityManager] Improve multi-thread access the same provider"
This reverts commit
57307b21cbdb261eeca081051ed61540dcf905f8.
Bug:
20091132
Wale Ogunwale [Fri, 24 Apr 2015 21:44:54 +0000 (14:44 -0700)]
Revert "Clean-up state if we have an exception when acquiring provider"
This reverts commit
73e239bdc9493d81215d5afe739b3ed095686ba2.
Bug:
20091132
Julia Reynolds [Thu, 23 Apr 2015 17:59:20 +0000 (13:59 -0400)]
Only skip unrecognized tags.
This fixes policy loss seen on device reboot when device admins
applied certain policies.
Bug:
20516960
Change-Id: I6e2a3b8de610c00ea1a2edbb026523bfdc365775
Wei Jia [Fri, 24 Apr 2015 18:37:51 +0000 (11:37 -0700)]
MediaSync: add OnErrorListener.
Bug:
19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
Andy Hung [Fri, 24 Apr 2015 06:50:28 +0000 (23:50 -0700)]
Unhide new channel masks and deprecate old channel masks
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
Kenny Root [Fri, 24 Apr 2015 21:26:06 +0000 (21:26 +0000)]
Merge "frameworks/base: switch to using NativeConstants."
Alex Klyubin [Fri, 24 Apr 2015 21:25:31 +0000 (21:25 +0000)]
Merge "resolved conflicts for merge of
f9c14b7d to master"
Alex Klyubin [Fri, 24 Apr 2015 21:11:52 +0000 (14:11 -0700)]
resolved conflicts for merge of
f9c14b7d to master
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
Jonathan Basseri [Fri, 24 Apr 2015 21:20:50 +0000 (21:20 +0000)]
Merge "Never return a reference to sDefaults."
Xiyuan Xia [Fri, 24 Apr 2015 21:13:53 +0000 (21:13 +0000)]
Merge "Use fillColor for battery bolt color."
Rubin Xu [Fri, 24 Apr 2015 21:14:37 +0000 (21:14 +0000)]
Merge "Add missing permission check in MountService"
Quddus Chong [Fri, 24 Apr 2015 21:09:27 +0000 (21:09 +0000)]
am
94089591: am
9774e8ab: Merge "docs: Updated What\'s New for GMS v7.3 to remove Maps support for Wear." into lmp-mr1-ub-docs
* commit '
9408959144d72d72afe89c3cf3de3d3d556a58b5':
docs: Updated What's New for GMS v7.3 to remove Maps support for Wear.
Scott Rowe [Fri, 24 Apr 2015 21:08:52 +0000 (21:08 +0000)]
am
eec5463c: am
5e95a917: am
17c0b254: am
ccfedfcc: am
5827af11: am
02e4f2fb: Merge "docs: Supported media protocols, codecs, formats for Android TV" into lmp-docs
* commit '
eec5463cb9617d6f2eee43cbf1fe35deaad30d90':
docs: Supported media protocols, codecs, formats for Android TV
Etan Cohen [Fri, 24 Apr 2015 01:25:08 +0000 (18:25 -0700)]
Bluetooth document fix: remove reference from open API to hidden entities
Change-Id: I183ae1083727d2e2b96aa503d0e90d81ce3b1a82
Etan Cohen [Thu, 23 Apr 2015 19:26:37 +0000 (12:26 -0700)]
Fix build due to merge of
7595842 and renaming due to
8eb87f0
I.e. rename mVideoCallback -> mCallback. Line with original name
was added in mwd, renaming was done in master. The renaming CL
was cherry-picked to mwd (and build probably fixed there).
Change-Id: I462a0fedd00293a148404e1419740bf492ae5de9
Etan Cohen [Fri, 24 Apr 2015 21:06:22 +0000 (14:06 -0700)]
Merge commit '
052a0da' into merge2
Alan Viverette [Fri, 24 Apr 2015 21:06:12 +0000 (21:06 +0000)]
Merge "Fix list selector background for Material spec"
Etan Cohen [Fri, 24 Apr 2015 21:06:00 +0000 (14:06 -0700)]
Merge commit '
db1dbb8' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:05:29 +0000 (14:05 -0700)]
Merge commit '
7e5e791' into merge2
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
Tony Mantler [Fri, 24 Apr 2015 21:04:22 +0000 (21:04 +0000)]
Merge "Add totalSize and availSize queries to StorageMeasurement"
Etan Cohen [Fri, 24 Apr 2015 21:03:41 +0000 (14:03 -0700)]
Merge commit '
170102d' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:03:28 +0000 (14:03 -0700)]
Merge commit '
4cb5d80' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:03:06 +0000 (14:03 -0700)]
Merge commit '
83cda00' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:02:45 +0000 (14:02 -0700)]
Merge commit '
c91bc62' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:02:26 +0000 (14:02 -0700)]
Merge commit '
cffc360' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:02:07 +0000 (14:02 -0700)]
Merge commit '
7f61051' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:01:43 +0000 (14:01 -0700)]
Merge commit '
167c3a7' into merge2
Etan Cohen [Fri, 24 Apr 2015 21:01:16 +0000 (14:01 -0700)]
Merge commit '
4467b98' into merge2
Change-Id: I5ec0d1942f9f949fe915916115e67b3d41fdb9c9
Simranjit Singh Kohli [Fri, 24 Apr 2015 21:00:04 +0000 (21:00 +0000)]
Merge "[Fix confirmCredntials flow]"