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

189988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fyodor Kupolov
de1500c256 Merge "Added SystemServiceRegistry to preloaded-classes" 2015-04-24 23:02:42 +00:00
Seigo Nonaka
9a1cf497e5 Merge "Notify IME visibility when showWindow is called." 2015-04-24 22:46:14 +00:00
Zhijun He
f9c2dcf6b4 Merge "Image: fix build break" 2015-04-24 22:38:50 +00:00
Jens Ole Lauridsen
0525677343 Merge "parcel: Add efficient methods for writing and reading a parcelable." 2015-04-24 22:37:46 +00:00
Wale Ogunwale
584e513952 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"
 2015-04-24 22:35:34 +00:00
Wale Ogunwale
169364c1e5 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"
 2015-04-24 22:35:26 +00:00
Zhijun He
766ba09207 Image: fix build break 
Change-Id: I51e91a6c370626603f79371c16c8a10195ba63da
 2015-04-24 15:34:11 -07:00
Wale Ogunwale
cc9c597dad 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"
 2015-04-24 22:26:08 +00:00
Wale Ogunwale
4cdc7e842d 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"
 2015-04-24 22:26:04 +00:00
Etan Cohen
1418054108 Rename removeVideoCallListener to unregisterCallback 
Change-Id: Ie6b5ac9131e81900efc7d3fa67056aa47d566a44
 2015-04-24 15:22:03 -07:00
Wale Ogunwale
d639a45324 am e60077e6: Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 
* commit 'e60077e62a441dbcc132b2abb35d998ab48d261c':
  Revert "[ActivityManager] Improve multi-thread access the same provider"
 2015-04-24 22:15:02 +00:00
Wale Ogunwale
e2047da6f3 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"
 2015-04-24 22:14:56 +00:00
Kenny Root
22335a9730 am 6c1af7ea: am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit '6c1af7ea497b1a2f04bdf45a19d2147f5b9665b9':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 22:13:26 +00:00
Jae Seo
9677822097 Merge "TIF: Use Preconditions.checkNotNull for null checking" 2015-04-24 22:03:44 +00:00
Mike Lockwood
bbaf48b386 Merge "UsbAlsaManager: Fix NPE when running in emulator" 2015-04-24 22:03:06 +00:00
Kenny Root
6c1af7ea49 am 8652bce1: am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit '8652bce13765fb29329df2a4ccca4591bae28de5':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 22:00:56 +00:00
Zhijun He
18191b4a52 Merge "ImageWriter: fix and cleanup the closed Image Handling" 2015-04-24 21:59:21 +00:00
Mike Lockwood
1f13872a01 UsbAlsaManager: Fix NPE when running in emulator 
Bug: 20537358
Change-Id: I46693e45eb6127118cbd54fc3490dc58840b5797
 2015-04-24 14:56:32 -07:00
Wale Ogunwale
e60077e62a Merge "Revert "[ActivityManager] Improve multi-thread access the same provider"" 2015-04-24 21:49:47 +00:00
Kenny Root
8652bce137 am c71f2648: Merge "frameworks/base: switch to using NativeConstants." 
* commit 'c71f264847eb75d53c0f99e6e1c42a8a1527d3b4':
  frameworks/base: switch to using NativeConstants.
 2015-04-24 21:49:47 +00:00
Wale Ogunwale
d9bf26522b Merge "Revert "Clean-up state if we have an exception when acquiring provider"" 2015-04-24 21:49:41 +00:00
Lajos Molnar
e0112b51a1 MediaSync: rename onReturnAudioBuffer to onAudioBufferConsumed 
Bug: 19666434
Change-Id: I117d4a1ab29e5c8e02879d2321316b669c8e43ae
 2015-04-24 14:47:38 -07:00
Wei Jia
197b3daed7 Merge "MediaSync: add OnErrorListener." 2015-04-24 21:46:22 +00:00
Wale Ogunwale
1d646128b2 Revert "[ActivityManager] Improve multi-thread access the same provider" 
This reverts commit 57307b21cbdb261eeca081051ed61540dcf905f8.

Bug: 20091132
 2015-04-24 14:45:14 -07:00
Wale Ogunwale
67fe0a450c Revert "Clean-up state if we have an exception when acquiring provider" 
This reverts commit 73e239bdc9493d81215d5afe739b3ed095686ba2.

Bug: 20091132
 2015-04-24 14:44:54 -07:00
Cedric Ho
c663d99f00 Enable VoiceInteractionService on watch. 
Change-Id: I1d23ba55a98f6d68942cc344b4a564ab62285656
 2015-04-24 14:38:25 -07:00
Julia Reynolds
6afa666c9f Only skip unrecognized tags. 
This fixes policy loss seen on device reboot when device admins
applied certain policies.

Bug: 20516960
Change-Id: I6e2a3b8de610c00ea1a2edbb026523bfdc365775
 2015-04-24 17:35:16 -04:00
Wei Jia
746306521a MediaSync: add OnErrorListener. 
Bug: 19666434
Change-Id: I34983d6101cc0f93ee74bdcec5d272808842a5c2
 2015-04-24 14:32:36 -07:00
Andy Hung
7fdf51b18a Unhide new channel masks and deprecate old channel masks 
Change-Id: Ie95a38e782fe491ffc2f2670c2b9f52afb33abdd
 2015-04-24 14:27:21 -07:00
Kenny Root
c71f264847 Merge "frameworks/base: switch to using NativeConstants." 2015-04-24 21:26:14 +00:00
Alex Klyubin
878141321e Merge "resolved conflicts for merge of f9c14b7d to master" 2015-04-24 21:25:33 +00:00
Alex Klyubin
40485f5aac resolved conflicts for merge of f9c14b7d to master 
Change-Id: Ifa29891b8ad7979cbc28c54180b9606bb1319ff0
 2015-04-24 14:21:41 -07:00
Jonathan Basseri
0d16b908c3 Merge "Never return a reference to sDefaults." 2015-04-24 21:20:53 +00:00
Xiyuan Xia
cdce55aa14 Merge "Use fillColor for battery bolt color." 2015-04-24 21:14:42 +00:00
Rubin Xu
f8d26e24af Merge "Add missing permission check in MountService" 2015-04-24 21:14:41 +00:00
Quddus Chong
3a344962d5 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.
 2015-04-24 21:09:27 +00:00
Scott Rowe
0f21039c92 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
 2015-04-24 21:08:52 +00:00
Etan Cohen
fd840dd603 Bluetooth document fix: remove reference from open API to hidden entities 
Change-Id: I183ae1083727d2e2b96aa503d0e90d81ce3b1a82
 2015-04-24 14:06:58 -07:00
Etan Cohen
8942724930 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
 2015-04-24 14:06:40 -07:00
Etan Cohen
1123a831c4 Merge commit '052a0da' into merge2 2015-04-24 14:06:22 -07:00
Alan Viverette
8f74a5d811 Merge "Fix list selector background for Material spec" 2015-04-24 21:06:15 +00:00
Etan Cohen
b271d27dbc Merge commit 'db1dbb8' into merge2 2015-04-24 14:06:00 -07:00
Etan Cohen
f9465fb6d2 Merge commit '7e5e791' into merge2 
Change-Id: Ie4889e3448b905afe5c0df453da96df0735e60d7
 2015-04-24 14:05:29 -07:00
Tony Mantler
7e98b54968 Merge "Add totalSize and availSize queries to StorageMeasurement" 2015-04-24 21:04:24 +00:00
Etan Cohen
a5f0b1377b Merge commit '170102d' into merge2 2015-04-24 14:03:41 -07:00
Etan Cohen
644f41368f Merge commit '4cb5d80' into merge2 2015-04-24 14:03:28 -07:00
Etan Cohen
a6e5ff899a Merge commit '83cda00' into merge2 2015-04-24 14:03:06 -07:00
Etan Cohen
4de834eb63 Merge commit 'c91bc62' into merge2 2015-04-24 14:02:45 -07:00
Etan Cohen
5a63f39171 Merge commit 'cffc360' into merge2 2015-04-24 14:02:26 -07:00
Etan Cohen
94f2c27aca Merge commit '7f61051' into merge2 2015-04-24 14:02:07 -07:00