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
Hemal Patel
eb95687745 Docs: Fixed an invalid initialization of ExampleProvider member in Content URI 
patterns docs sample

Bug: 28679030
Change-Id: Ia8f30fa82dbbced9c177e39a61834f25d5b331b2
 2016-05-25 19:11:59 -07:00
Adam Lesinski
0c2f681bdf Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a 
am: fbdf46f663

* commit 'fbdf46f66323e80d4e90e926d0f199b64bf71f14':
  Use app's best locale if they override LocaleList

Change-Id: I99bb920efcc7befa2817bed3a7fb7a0bcad4a13e
 2016-05-26 02:10:48 +00:00
Android Build Merger (Role)
a96bd319c6 Merge "Merge "N is API 24" into nyc-dev am: bc983c4431 am: 528a5bd466" into nyc-mr1-dev-plus-aosp 2016-05-26 02:01:49 +00:00
Adam Powell
823c877d01 Merge "N is API 24" into nyc-dev am: bc983c4431 
am: 528a5bd466

* commit '528a5bd466a18f2d955ae364b0e8600b74fa790f':
  N is API 24

Change-Id: I3f3e4c597924bc5b5f47c3c029ee52e147c61b34
 2016-05-26 01:59:49 +00:00
Trevor Johns
46c1d5a5d2 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 
am: c8c2abed0e

* commit 'c8c2abed0e7418d7e0fb0ef73a0c363cec011b95':
  docs: Fix broken link in Volley training

Change-Id: I916717fca33fc1466cd1c022c6a4f5f931d00ebe
 2016-05-26 01:59:17 +00:00
Adam Powell
3579a6a634 Merge "N is API 24" into nyc-dev am: bc983c4431 
am: 0b478d5b05

* commit '0b478d5b052c4440a0eb8686d400d1595ead1857':
  N is API 24

Change-Id: I90b772e177cefff1071a9859f046f683411a7e59
 2016-05-26 01:56:59 +00:00
Sid Soundararajan
edd7088405 Merge "Make content descriptions of task cards, the title description" into nyc-dev am: 7cb7a0aa60 am: 1f4a0d178f 
am: 75b84a9355

* commit '75b84a9355feb5719fbb53e5ffcdbc216cdada63':

Change-Id: I7e296e210c74edcd9da61ab9e6c438a1febb0cac
 2016-05-26 01:51:53 +00:00
Dianne Hackborn
24b6928a0f Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev am: dbcca24f8e am: 2198f8f584 
am: 725a87c785

* commit '725a87c78591cb7ddbf303a895485a215e7efb46':

Change-Id: If9061e7827e671c875723a261deb1969612f5e75
 2016-05-26 01:51:49 +00:00
Alan Viverette
f6bfcefcef Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570 am: aa833d7c20 
am: 040fa53a39

* commit '040fa53a39d3b8501fbf3e28597ed65e97607f59':

Change-Id: Ia56d87320c85b37566daa10805f877caed490197
 2016-05-26 01:51:43 +00:00
Jonathan Basseri
8a6561d177 Change how TelephonyManager handles subscriptions. 
Addressing API council feedback, remove* all subscription ID arguments
from API calls, and provide a factory method to create a new
TelephonyManager which uses a given subId.

* The subId methods will be @hidden instead of deleted.

Bug: 28845064
Change-Id: I2de8ae9e45bc14962c7c20d7d076ec83bce92cd3
 2016-05-25 18:49:11 -07:00
Selim Cinek
570bfa2768 Fixed the relative time spoken with accessibility 
The relative time was unclear for certain locales
and even worse 1m was spoken as 1 meter.

Change-Id: Ie172092da27ea8119906b0c301b5569bf3efabbb
Fixes: 28961667
 2016-05-25 18:44:44 -07:00
Adam Lesinski
fbdf46f663 Merge "Use app\'s best locale if they override LocaleList" into nyc-dev 
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I5a38d95f1ea7d7fd676fa60effa467af219c75cf
 2016-05-26 01:38:34 +00:00
Adam Lesinski
ade0bce32a Merge "Use app\'s best locale if they override LocaleList" into nyc-dev 
am: fbf3a0964a

* commit 'fbf3a0964a458508f834bffd18198394037bb5c1':
  Use app's best locale if they override LocaleList

Change-Id: I980061c2e818a746eb46e64a88887be8566ad618
 2016-05-26 01:38:22 +00:00
Joe Fernandez
e8a0b488dc docs: Remove Advertising ID page and redirect to GMS reference docs 
b/28965089

Change-Id: I16141cf5711358c1b38f7e28a8150e2281990eb6
 2016-05-25 18:36:12 -07:00
Trevor Johns
c8c2abed0e docs: Fix broken link in Volley training am: 05dd9d2c29 
am: 346114e346

* commit '346114e3467cc06b2a90467a00288f6944dd969b':
  docs: Fix broken link in Volley training

Change-Id: Ifb20e8fd2a2c4d87786e61e6490e52dd06742810
 2016-05-26 01:32:43 +00:00
Andrii Kulian
e070b6c78a Merge "Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 am: 7c7de841d5" into nyc-mr1-dev-plus-aosp 
am: dee80373be

* commit 'dee80373be3362f6c7c719228b3803afcf30f4ec':

Change-Id: Iafb449296995c68e38ec8d91b636518f7e1fd292
 2016-05-26 01:32:01 +00:00
Chris Tate
b997a7c652 Merge "Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 am: 1964936fa8" into nyc-mr1-dev-plus-aosp 
am: c4e12f303e

* commit 'c4e12f303e8eb106235f3973660647b3039adc43':

Change-Id: I0bd14cd2eb704ff9e9796d85ee87b460b2366e86
 2016-05-26 01:29:36 +00:00
Stephan Linzner
ffb5e601b8 Merge "Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 am: 14ba2e78fd" into nyc-mr1-dev-plus-aosp 
am: 4407a3de81

* commit '4407a3de8158d2ddbb6d66c58fc1c723f830926d':

Change-Id: If07e462e6c2b1ebd266f470131526e21a099118e
 2016-05-26 01:29:24 +00:00
Sid Soundararajan
e7dea8db12 Merge "Make content descriptions of task cards, the title description" into nyc-dev am: 7cb7a0aa60 am: 3d09accb9d 
am: 8f6b4d1a75

* commit '8f6b4d1a7570e4988291a0077e206f6197541af8':
  Make content descriptions of task cards, the title description

Change-Id: Idfa9d396e3281a774e1008430d8c3a111232386e
 2016-05-26 01:27:14 +00:00
Dianne Hackborn
1e0ae3388a Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev am: dbcca24f8e am: ce60320848 
am: bd8421e305

* commit 'bd8421e3059350872cc4e26726afa6830b0d2cd1':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: I73bd2a2cc996d5e6f958fcca8097421c076d0658
 2016-05-26 01:26:55 +00:00
Alan Viverette
694267abf3 Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570 am: 57b00f7c6a 
am: 246c233116

* commit '246c233116c481b9da225ee8dfbb2119e6b6b8e6':
  Fix borderless colored button text color

Change-Id: I44367637e88290b10f1c44a6c4d5f37eb93eca81
 2016-05-26 01:26:36 +00:00
Andrii Kulian
593f17bc3f Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 am: e2a0c9437c 
am: c448cf3af4

* commit 'c448cf3af4ae10fc9775862f452f1cdab9743440':
  Fix exception when trying to update config of detached stack

Change-Id: Ia576bafce0270a304939d0b273343283dd76d110
 2016-05-26 01:25:56 +00:00
Chris Tate
8941b48ce2 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 am: 84dd33d8e5 
am: fd752502a6

* commit 'fd752502a684268d526dd0743bd7a17bc277cd2b':
  Backport of backup transport whitelist

Change-Id: I92a155ef2fd5293273d6c1d1e254b52e52087e31
 2016-05-26 01:25:18 +00:00
Adam Powell
0b478d5b05 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ib90f6e51c793d1cb61f806196b93736edf2014d8
 2016-05-26 01:22:00 +00:00
Adam Powell
528a5bd466 Merge "N is API 24" into nyc-dev 
am: bc983c4431

* commit 'bc983c443139c7b4605f98d56bd9ad7652a9938b':
  N is API 24

Change-Id: Ic45d31eb721e9831fafd5413ce60947eb7fbad7e
 2016-05-26 01:21:19 +00:00
Sid Soundararajan
75b84a9355 Merge "Make content descriptions of task cards, the title description" into nyc-dev am: 7cb7a0aa60 
am: 1f4a0d178f

* commit '1f4a0d178f5eb7ee85ac36f03cf8c937e8a12dcd':

Change-Id: I06e95d6052660138676bf57512acb7b2260fd43f
 2016-05-26 01:21:16 +00:00
Dianne Hackborn
725a87c785 Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev am: dbcca24f8e 
am: 2198f8f584

* commit '2198f8f5841d3e7df7cd78d189fecdfc60a4eba0':

Change-Id: I5fc0d059ac2958e4238e7f50deedbdfd3057037d
 2016-05-26 01:21:08 +00:00
Alan Viverette
040fa53a39 Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570 
am: aa833d7c20

* commit 'aa833d7c20351267c071277c7760d9fea4a60433':

Change-Id: Iec9e6cdb6c3f588423c3ac7497893039dc3a1766
 2016-05-26 01:20:55 +00:00
Trevor Johns
346114e346 docs: Fix broken link in Volley training 
am: 05dd9d2c29

* commit '05dd9d2c291c3b5becdf27b78cc0685be3bb5389':
  docs: Fix broken link in Volley training

Change-Id: Ia20dd9788d855129033c82e2161e01dc382d85b7
 2016-05-26 01:18:44 +00:00
Christopher Tate
c1c8325619 Use backstop timeouts on asynchronous countdown during preflight 
Work around nebulous lost-timeout issues by adding a backstop timeout
to "wait for result" latch operations.  When we hit these, the initial
conditions will be reported as final result; so make those intial states
match the error condition that is appropriate to such a timeout.

Bug 28963707

Change-Id: I4d21a86c48e87633118b1e6eaa05c1d966efec81
 2016-05-25 18:13:30 -07:00
TreeHugger Robot
fbf3a0964a Merge "Use app's best locale if they override LocaleList" into nyc-dev 2016-05-26 01:11:03 +00:00
Android Build Merger (Role)
dee80373be Merge "Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 am: 7c7de841d5" into nyc-mr1-dev-plus-aosp 2016-05-26 01:07:38 +00:00
Android Build Merger (Role)
c4e12f303e Merge "Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 am: 1964936fa8" into nyc-mr1-dev-plus-aosp 2016-05-26 01:07:27 +00:00
Android Build Merger (Role)
4407a3de81 Merge "Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 am: 14ba2e78fd" into nyc-mr1-dev-plus-aosp 2016-05-26 01:07:17 +00:00
Andrii Kulian
8b0d2c1423 Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 
am: 7c7de841d5

* commit '7c7de841d5c3226e0551fdc5eba5bb72f1220696':

Change-Id: I12d477463c766ba849b15957e449fb3351792844
 2016-05-26 01:05:27 +00:00
Stephan Linzner
2f24635866 Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 am: 347d660ce2 
am: 701438fbf2

* commit '701438fbf295101ed25b65f96cec0cc022d4029a':
  Un-deprecated Android mock testing APIs

Change-Id: If3bb6875e1d453f4a80c985b6f08115a78908480
 2016-05-26 01:05:07 +00:00
Chris Tate
d0a2224ac0 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev am: 36a1b38e89 
am: 1964936fa8

* commit '1964936fa8a00b79479535f14070f5be1fe19023':

Change-Id: I34725ef0b081a0d8e4d31d4b94b73d99613061a5
 2016-05-26 01:03:29 +00:00
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +00:00
Sid Soundararajan
8f6b4d1a75 Merge "Make content descriptions of task cards, the title description" into nyc-dev am: 7cb7a0aa60 
am: 3d09accb9d

* commit '3d09accb9db26eae36a1e3bab415c469a4bbd3c4':
  Make content descriptions of task cards, the title description

Change-Id: Ib6f6a6cec21286d797b84ceefa4258bc5e69542b
 2016-05-26 01:02:00 +00:00
Stephan Linzner
a28a3b547f Merge "Un-deprecated Android mock testing APIs" into nyc-dev am: dac0708ea0 
am: 14ba2e78fd

* commit '14ba2e78fdef008672565901e72c46dc4fa09ae3':

Change-Id: I5d6682efb5cea9a98caaea37a6d547848999177e
 2016-05-26 01:01:59 +00:00
Dianne Hackborn
bd8421e305 Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev am: dbcca24f8e 
am: ce60320848

* commit 'ce60320848d8515e6a91f3f3a3cb1216107726de':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: Iddb62c3079bef31acac4d1698242711a27c5dbb6
 2016-05-26 01:01:55 +00:00
Alan Viverette
246c233116 Merge "Fix borderless colored button text color" into nyc-dev am: 8f0ab27570 
am: 57b00f7c6a

* commit '57b00f7c6aaaa8f0f4d9ad2b85ddd3ba9fb97d3a':
  Fix borderless colored button text color

Change-Id: If2e5ddbd5e520cd39f8d2520b9047da175cc5f75
 2016-05-26 01:01:49 +00:00
Sid Soundararajan
3d09accb9d Merge "Make content descriptions of task cards, the title description" into nyc-dev 
am: 7cb7a0aa60

* commit '7cb7a0aa60f0f01fbcb5b5023f642c527f3f1985':
  Make content descriptions of task cards, the title description

Change-Id: I85d3cc167f795e236efd3d2f7452cf0cca862899
 2016-05-26 00:54:04 +00:00
Sid Soundararajan
1f4a0d178f Merge "Make content descriptions of task cards, the title description" into nyc-dev 
am: 7cb7a0aa60

* commit '7cb7a0aa60f0f01fbcb5b5023f642c527f3f1985':
  Make content descriptions of task cards, the title description

Change-Id: I96248be35c3c1861d0a01cc64faa1eea56379334
 2016-05-26 00:54:04 +00:00
Dianne Hackborn
ce60320848 Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev 
am: dbcca24f8e

* commit 'dbcca24f8e239a34ededaef8a7fc924c196f98cb':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: I020e1ccbd04ada3c1ff7826042bc476b8a755584
 2016-05-26 00:53:58 +00:00
Dianne Hackborn
2198f8f584 Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev 
am: dbcca24f8e

* commit 'dbcca24f8e239a34ededaef8a7fc924c196f98cb':
  Fix issue #28964589: Binding dies when (unrelated) component is disabled in package

Change-Id: Ie6041e1284ec6824f3b8c01f751f1555f55bc69e
 2016-05-26 00:53:53 +00:00
Alan Viverette
57b00f7c6a Merge "Fix borderless colored button text color" into nyc-dev 
am: 8f0ab27570

* commit '8f0ab27570ef48b234c9454804b42cf28e0a7313':
  Fix borderless colored button text color

Change-Id: Ife5682065ff85bfea6123fbe552e11e2067584d3
 2016-05-26 00:53:51 +00:00
Alan Viverette
aa833d7c20 Merge "Fix borderless colored button text color" into nyc-dev 
am: 8f0ab27570

* commit '8f0ab27570ef48b234c9454804b42cf28e0a7313':
  Fix borderless colored button text color

Change-Id: Ida0d73d23ded8f8a51818791ce1de14307e5bfcf
 2016-05-26 00:53:49 +00:00
Christopher Tate
1fa817c057 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours 
am: 88c9eae886

* commit '88c9eae886ff99d37da0f13af4b2e045e9332289':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I3e37d8e8e6064dc0f5640c38b9cc4a72bd028c19
 2016-05-26 00:53:35 +00:00
Andrii Kulian
c448cf3af4 Merge "Fix exception when trying to update config of detached stack" into nyc-dev am: a1984286d3 
am: e2a0c9437c

* commit 'e2a0c9437cbf33f0641894949f7f0bf664798293':
  Fix exception when trying to update config of detached stack

Change-Id: Ia64ba236330f6e4fca39ab690aa2c780bf53163d
 2016-05-26 00:52:20 +00:00