Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyatt Riley
b5b03bc450 Merge "Mapping up/down of legacy Gps vs. Gnss Status" into nyc-dev 2016-05-19 18:37:54 +00:00
Sanket Agarwal
64c75b9bad While turning OFF do not honor ON requests. am: 090bf55130 
am: 29c7056f25

* commit '29c7056f2530e7f143a51a6abb24ecec30fbb523':
  While turning OFF do not honor ON requests.

Change-Id: Iaa3ff49bcb42e844eb76c919a80d8b3e0017c35c
 2016-05-19 18:37:34 +00:00
Chris Craik
6badb0fb54 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 am: c387613d53 
am: f7688a4f29

* commit 'f7688a4f297fcab18ffdbd0ed10405ba862e8ec9':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I7f3c0af53759216af85351d950631af81cdf1316
 2016-05-19 18:35:30 +00:00
Sanket Agarwal
9d2441369b While turning OFF do not honor ON requests. 
am: 090bf55130

* commit '090bf551308e68b1b2a996c959b608cabd025c5c':
  While turning OFF do not honor ON requests.

Change-Id: I528c640a9bc482fbbec3b11eef6569c93a632b76
 2016-05-19 18:32:24 +00:00
Sanket Agarwal
29c7056f25 While turning OFF do not honor ON requests. 
am: 090bf55130

* commit '090bf551308e68b1b2a996c959b608cabd025c5c':
  While turning OFF do not honor ON requests.

Change-Id: I878609e6dfc4e18bdf30e4c14806cb9c2c3d8abf
 2016-05-19 18:32:21 +00:00
Chris Craik
f7688a4f29 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c am: 8fc4c789f1 
am: c387613d53

* commit 'c387613d53284816ebb00ebeb41633f6179fc972':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I648ee1970cae83a816e9462dcbdd2208b7c205d4
 2016-05-19 18:31:33 +00:00
Sanket Agarwal
090bf55130 While turning OFF do not honor ON requests. 
Native stack does not handle being put from OFF -> ON state without
doing a complete cleanup. Hence instead of going from start -> ON -> OFF
-> cleanup it goes start -> ON -> OFF ->ON -> ... usually leads to race
conditions down the road in native.

This patch is a workaround so that we can throw away the requests if we
are in currently "turning off" phase. The side-effect would be that user
will need to turn it ON again. The race happens when the turn OFF time
is longer but usually it is found to be close to order of seconds hence
the wait should be bounded.

Bug: b/28318203
Change-Id: I14f6633f31311e5b561e1dcbc8a9d6d2a5dd6fdc
 2016-05-19 18:27:27 +00:00
Sungki Kim
d35167adca Fix GATT autoConnect race condition 
As pointed out here:
https://code.google.com/p/android/issues/detail?id=69834

registerApp() causes onClientRegistered() to happen before autoConnect
is set. This patch fixes that.

Bug: 28861330
Change-Id: Ie1174c0f224f5084178439420b383164d22d542c
 2016-05-19 18:25:25 +00:00
Sungki Kim
636ab03dfe Fix GATT autoConnect race condition 
As pointed out here:
https://code.google.com/p/android/issues/detail?id=69834

registerApp() causes onClientRegistered() to happen before autoConnect
is set. This patch fixes that.

Bug: 28861330
Change-Id: Ie1174c0f224f5084178439420b383164d22d542c
 2016-05-19 18:23:44 +00:00
Android Build Merger (Role)
3ed763f360 Merge "Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c am: 14c9a306ad" into nyc-mr1-dev-plus-aosp 2016-05-19 18:22:17 +00:00
Sergio Giro
882c7d244c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c 
am: 3eb0680642

* commit '3eb06806429f444fe87b894308681e20e6871c7d':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia3c21577450bc028548e8427a4a0f9f552e4890f
 2016-05-19 18:21:50 +00:00
Sergio Giro
8b0323eead Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev am: 44b9f13f9c 
am: 14c9a306ad

* commit '14c9a306ad5700c1ab320c790fc45372243f0151':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I294dcbfa1fbf6066357b8291b5b7af8e0e7525ec
 2016-05-19 18:21:48 +00:00
Steve McKay
78951ad998 Fix RTL issue in delete dialog. 
Bug:28772371
Change-Id: Ia5d3e074ac40b73f21cc83f507735d0918799966
 2016-05-19 11:21:41 -07:00
Chris Craik
c387613d53 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 am: f6987bc94c 
am: 8fc4c789f1

* commit '8fc4c789f1a356d765e98b0c3f1569fabbfb0890':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I42b9e0c852a685bd0ae1d5dd1145769b9dfd095d
 2016-05-19 18:21:26 +00:00
Kevin Hufnagle
eb9da7832b Merge "Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 am: 122ffb50ea" into nyc-mr1-dev-plus-aosp 
am: 9f112e125f

* commit '9f112e125f4b649af7e35b654c0b03c237498376':

Change-Id: I9cf3071fba29daeebfda993ee1ba7d81aeb66bdb
 2016-05-19 18:11:32 +00:00
Kevin Hufnagle
455bf254fc Merge "Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 am: d70568065b" into nyc-mr1-dev-plus-aosp 
am: bbcc2b39bd

* commit 'bbcc2b39bd561bc49a14fa4656dd14ff234e5689':

Change-Id: I32a4f8286802c4fcf7e13abdf85589369211d631
 2016-05-19 18:11:10 +00:00
Andrii Kulian
a6bacdbfd5 Merge "Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 am: 5ac36afb0b" into nyc-mr1-dev-plus-aosp 
am: 595732c3a4

* commit '595732c3a44ec8fdfc9851a3fd022afcae9db474':

Change-Id: Ifd02390e3c815ce091ad408daad48593e2f39c8b
 2016-05-19 18:10:55 +00:00
Kevin Hufnagle
f358833853 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 am: 8f69021a90 
am: 9b084d3ab9

* commit '9b084d3ab9f2cd9619503fa157d229fd54b7c16a':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: Ic7d1acd1914686065c5329a67385f5d9e01b6643
 2016-05-19 18:10:42 +00:00
Chris Craik
8fc4c789f1 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd am: b6f51341e8 
am: f6987bc94c

* commit 'f6987bc94c00fa1390aee6f665a560dcb94d7942':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: Ice3af646ca302dea7797a2ff65ed83da7beaaa90
 2016-05-19 18:10:27 +00:00
Kevin Hufnagle
7e41aeaa56 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 am: eeaa9df16c 
am: 6728ad95f3

* commit '6728ad95f35e552250067d224a3efef5f4c7db21':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: If5dc2316d1482da98c84da05f07d5acf3291d644
 2016-05-19 18:10:24 +00:00
Sergio Giro
14c9a306ad Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: I22e0d3b3967ad205e0e9aad328790e907335ed17
 2016-05-19 18:10:04 +00:00
Andrii Kulian
06a24fb5af Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 am: 67cae3965b 
am: 2d334f4d02

* commit '2d334f4d02b230a1dbb895d4a9688bbd12d7451d':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: Ic9f69956f510db792b8159917fb06b6abb3ce84b
 2016-05-19 18:10:00 +00:00
Sergio Giro
3eb0680642 Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 
am: 44b9f13f9c

* commit '44b9f13f9cfaf2e1136a1f2baab54b229d221fe4':
  ZygoteInit: install AndroidKeyStoreProvider in the Zygote

Change-Id: Ia20b312dfd8181fadd38f075817630a1c5ab518f
 2016-05-19 18:09:30 +00:00
Chris Craik
f6987bc94c Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs am: 36785ff4bd 
am: b6f51341e8

* commit 'b6f51341e8bb34de8dfdc2694599c7090971fdf8':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I323752b6f1f51a659af0aa84e7305c75ccbf0552
 2016-05-19 17:59:55 +00:00
Jason Monk
dd03659cb4 QS Edit: Better handling if drags 
- don't add/remove divider, hide/show it
 - don't break drag sequence by returning false
 - clean up some logic

Change-Id: I3236b1bc8a1a810e6e696c21af747bd6369c5050
Fixes: 28067638
 2016-05-19 13:59:41 -04:00
Sergio Giro
44b9f13f9c Merge "ZygoteInit: install AndroidKeyStoreProvider in the Zygote" into nyc-dev 2016-05-19 17:53:00 +00:00
Android Build Merger (Role)
9f112e125f Merge "Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 am: 122ffb50ea" into nyc-mr1-dev-plus-aosp 2016-05-19 17:52:39 +00:00
Android Build Merger (Role)
bbcc2b39bd Merge "Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 am: d70568065b" into nyc-mr1-dev-plus-aosp 2016-05-19 17:52:24 +00:00
Android Build Merger (Role)
595732c3a4 Merge "Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 am: 5ac36afb0b" into nyc-mr1-dev-plus-aosp 2016-05-19 17:52:10 +00:00
Kevin Hufnagle
9a93d1de53 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 
am: 122ffb50ea

* commit '122ffb50ea660b712587952b2966c4bb63a6721c':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: Iebf999aaf7c35a67a70b58405ec17e8265ca3ca0
 2016-05-19 17:51:35 +00:00
Kevin Hufnagle
04f9940e7d Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 
am: d70568065b

* commit 'd70568065bc059a6ca37c8c1b5cebccec03bfd81':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Ie27e0d13c2ee7b408d95e9af4b4edf5f1bc073cf
 2016-05-19 17:51:30 +00:00
Andrii Kulian
6a9fe446a1 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 
am: 5ac36afb0b

* commit '5ac36afb0b47b6d98175505c0fc879863943d879':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: I9241ec06dcd97ad19cc0a2a27687a7bc04e17dd7
 2016-05-19 17:51:20 +00:00
Kevin Hufnagle
9b084d3ab9 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev am: 7f3f4b6f30 
am: 8f69021a90

* commit '8f69021a908c9c805d53eefad1c4f2795d43f656':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: Ie88c5a8e60d00f15352d4b3311a8f66718a1566a
 2016-05-19 17:51:04 +00:00
Kevin Hufnagle
6728ad95f3 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 
am: eeaa9df16c

* commit 'eeaa9df16c8d17e657a643dbab9af584e291dc5d':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Ie0861b22d2a94cec4906ab8917d9d2369ce8a387
 2016-05-19 17:50:59 +00:00
Andrii Kulian
2d334f4d02 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev am: 7fae7be595 
am: 67cae3965b

* commit '67cae3965b5c2435a462f1635bf1aff511853fa0':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: If44c79f8b6b20fe1b1584cb8846da757b3201d89
 2016-05-19 17:50:51 +00:00
Chris Craik
b6f51341e8 Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs 
am: 36785ff4bd

* commit '36785ff4bda29f8055864e081012e12077509889':
  Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"

Change-Id: I9f50650cb3d52ba76aa61a28b9bf3aef36682d83
 2016-05-19 17:49:59 +00:00
Christopher Tate
98d609ce3f Incorporate feedback on new wallpaper-related APIs 
- Documentation
- Method naming
- Throwing exceptions rather than returning zero/null/false on input failures

Bug 28773334

Change-Id: Ia41c1e31c76b7114f3ffeb16033384cac5a1031d
 2016-05-19 10:33:22 -07:00
Ben Lin
f08fa0a522 Merge "Register change Uri and notify changes in bugreportServices." 2016-05-19 17:27:46 +00:00
Chris Craik
36785ff4bd Merge "Revert "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31"" into lmp-docs 2016-05-19 17:22:57 +00:00
Kevin Hufnagle
122ffb50ea Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev 
am: 7f3f4b6f30

* commit '7f3f4b6f30e9213f07b8a23500ee6c70981ca8d1':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I9c03d82f4f8cf27c1ca8b171ed3d423559098dd7
 2016-05-19 17:20:07 +00:00
Kevin Hufnagle
8f69021a90 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev 
am: 7f3f4b6f30

* commit '7f3f4b6f30e9213f07b8a23500ee6c70981ca8d1':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I5d32152d0fd871ed7569d65644710c1666a3a2e6
 2016-05-19 17:20:06 +00:00
Kevin Hufnagle
d70568065b Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 
am: 4465e8d6e6

* commit '4465e8d6e68e75b0b5c1114447b8cfeea3873b50':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I3fbddf1dce22e6edaae2ddd037b71657e2d4040e
 2016-05-19 17:20:03 +00:00
Kevin Hufnagle
eeaa9df16c Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 
am: 4465e8d6e6

* commit '4465e8d6e68e75b0b5c1114447b8cfeea3873b50':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: Icde96164ece2cdea09a5444e820c1f11b7a94cc8
 2016-05-19 17:20:00 +00:00
Andrii Kulian
5ac36afb0b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: Iab79d8cdb6f1f93bb44cceaaea5a838aee8e1cb0
 2016-05-19 17:19:54 +00:00
Andrii Kulian
67cae3965b Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 
am: 7fae7be595

* commit '7fae7be59514ba6a7fdc10bdb47c9a9fe09d2cef':
  Clear mResizedWhileNotDragResizing flag after reporting

Change-Id: I4a91f9f86e9a8e5fc228b733822561be56ee3a1a
 2016-05-19 17:19:50 +00:00
Android Build Merger (Role)
7f3f4b6f30 Merge "Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 am: 6b077de7d7" into nyc-dev 2016-05-19 17:13:48 +00:00
Android Build Merger (Role)
4465e8d6e6 Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev 2016-05-19 17:13:39 +00:00
Kevin Hufnagle
7f97adc223 Merge "docs: Restored references to "Know Your User" resource cards." into mnc-docs am: dbfd7dd16a am: 940de083a3 am: 8dc9a826d5 
am: 6b077de7d7

* commit '6b077de7d7c02f46c3a74430fa1b739d23d8c1c2':
  docs: Restored references to "Know Your User" resource cards.

Change-Id: I7f263ab12836c7f8cf734425dbe10fea3444572e
 2016-05-19 17:13:05 +00:00
Kevin Hufnagle
eedd9bf4b2 Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 
am: 2ebb73e557

* commit '2ebb73e5572eb400d6202c9a0e3d365e1fde9d7e':
  docs: Added Sony Xperia Z3 as a testing device for Android N.

Change-Id: I43a8431d48244a6807924239eac4c5211ce380b3
 2016-05-19 17:12:51 +00:00
Andrii Kulian
7fae7be595 Merge "Clear mResizedWhileNotDragResizing flag after reporting" into nyc-dev 2016-05-19 17:11:35 +00:00