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

189876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Etan Cohen
bd3dfa9d65 Merge commit '167c3a7' into merge2 2015-04-24 14:01:43 -07:00
Etan Cohen
9a070b309e Merge commit '4467b98' into merge2 
Change-Id: I5ec0d1942f9f949fe915916115e67b3d41fdb9c9
 2015-04-24 14:01:16 -07:00
Simranjit Singh Kohli
0208397726 Merge "[Fix confirmCredntials flow]" 2015-04-24 21:00:05 +00:00
Alan Viverette
78c2701e79 Fix list selector background for Material spec 
Bug: 20557738
Change-Id: Id0aa7e5dc1d5ddce83f9ef0e128ae5a97e9a06fb
 2015-04-24 13:59:02 -07:00
Etan Cohen
a179962b61 Merge commit '25a217c' into merge2 
Change-Id: I116a9dbf19e95651a7c50393e4dcd7fb59ca3f3f
 2015-04-24 13:58:45 -07:00
Etan Cohen
f491a5844a Merge commit '04b18ec' into merge2 2015-04-24 13:56:58 -07:00
Simranjit Singh Kohli
82d01782b3 [Fix confirmCredntials flow] 
This CL contains 2 fixes:

1. On a successfult confirm credential, lastAuthenticatedTime was
   not getting updated. This gets fixed.

2. Historically, confirmCredential used to work for accounts NOT on
   the device. Setting lastAuthenticated time only for existing
   accounts and preventing crash if account is not on the device.

Bug: 20141809
Change-Id: I301d49cbc4a594af6110366ef6f55350f74d250d
 2015-04-24 13:56:48 -07:00
Etan Cohen
d7b4b81274 Merge commit '7595842' into merge2 
Change-Id: I7e11e98e6d59562374195a8761d64a79dc0268e8
 2015-04-24 13:56:35 -07:00
Etan Cohen
3b8efc3e74 Merge commit '2bbd2b6' into merge2 2015-04-24 13:54:24 -07:00
Etan Cohen
27873b4080 Merge commit '4890351' into merge2 2015-04-24 13:54:15 -07:00
Xiyuan Xia
b07ce17328 Use fillColor for battery bolt color. 
Bug: 20178901
Change-Id: I19b1de98ece6681f5dd0a15a35f55fb88e4c2cfc
 2015-04-24 13:53:33 -07:00