Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
256,895 Commits 3 Branches 0 Tags
87f3aeeee2a9859cd312c3f1d8a18946cf8f582b
Commit Graph

256895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
68fb46153f Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 
am: 1a045584d4

* commit '1a045584d44030947793f2a48953ce54ff2df0c6':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: If2ede00cf1ab2bdb178eed09ec6f9cd6d28f8820
 2016-05-26 04:47:34 +00:00
Chad Brubaker
11b56641e5 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 
am: ce99e3c571

* commit 'ce99e3c57133b4418be4f0e2c8bc7dd9ea2815d2':
  Track changes to network security config manifest configuration

Change-Id: I6a09710dcef8b19c429f28fa90d72fd38284de3e
 2016-05-26 04:37:17 +00:00
Joe Fernandez
1a045584d4 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 
am: 9e823c7048

* commit '9e823c7048bce9373fd5ccf10003b2eb05175b2b':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: Ie5649d42ece35f36130abefd00c3a53d5252cd03
 2016-05-26 04:37:09 +00:00
Android Build Merger (Role)
ce99e3c571 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs 2016-05-26 04:26:33 +00:00
Joe Fernandez
9e823c7048 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs 2016-05-26 04:26:25 +00:00
Chad Brubaker
094e1470d9 Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 
am: c0f99aebdc

* commit 'c0f99aebdc7c803600e12cbe0d940219069eb066':
  Track changes to network security config manifest configuration

Change-Id: I46fc434934428ffbdfd7816c0a3b2590f97d4713
 2016-05-26 04:26:11 +00:00
Android Build Merger (Role)
908b765ba2 Merge "Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 am: 005ef10518" into nyc-mr1-dev-plus-aosp 2016-05-26 04:18:14 +00:00
Seigo Nonaka
6342fbab90 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 
am: 005ef10518

* commit '005ef10518adb9768ad6569f0c6b42db949083d4':
  Fix system locale propagation during user creation.

Change-Id: Ibbfebbfb28321bbd7275461b9e8d112577e05620
 2016-05-26 04:17:47 +00:00
Seigo Nonaka
d34ca400c6 Merge "Fix system locale propagation during user creation." into nyc-dev am: ce9f5e3657 
am: b03e7217f3

* commit 'b03e7217f3fa3144f69119a4e109cce934d6065a':
  Fix system locale propagation during user creation.

Change-Id: I6955bad489926525f6b50709bcf14b829ca9392d
 2016-05-26 04:17:39 +00:00
Chad Brubaker
c0f99aebdc Merge "Track changes to network security config manifest configuration" into mnc-mr-docs 2016-05-26 04:09:40 +00:00
Seigo Nonaka
b03e7217f3 Merge "Fix system locale propagation during user creation." into nyc-dev 
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: If31dcbe28d108ec12aa9f4aef4382dcb2da90aaf
 2016-05-26 04:07:40 +00:00
Seigo Nonaka
005ef10518 Merge "Fix system locale propagation during user creation." into nyc-dev 
am: ce9f5e3657

* commit 'ce9f5e3657b7a8fb68c6c65a2cd5a27eaf556cc8':
  Fix system locale propagation during user creation.

Change-Id: I020babcf2ce1aa632099457f2baf3497f5ac2946
 2016-05-26 04:07:33 +00:00
Seigo Nonaka
ce9f5e3657 Merge "Fix system locale propagation during user creation." into nyc-dev 2016-05-26 03:51:39 +00:00
Dirk Dougherty
3930b5091e Remove spurious url reference. 
Change-Id: I35e5869ed71677b11af8c451a16661faa896ca1f
 2016-05-25 20:29:59 -07:00
Wyatt Riley
c8f13d504f Prevent use of a null sCallbackObj by Hardware FLP 
Bug: 28730136
Change-Id: I5898583e8108c4cfa8574a0adc5b50d6983b247e
 2016-05-25 20:01:22 -07:00
Android Build Merger (Role)
f2a8ea9523 Merge "docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e am: 6e73a12804" into nyc-mr1-dev-plus-aosp 2016-05-26 02:48:46 +00:00
Trevor Johns
1b37a3e851 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e 
am: 6e73a12804

* commit '6e73a12804276d95c96fc66a80b2693a9bf35652':
  docs: Fix broken link in Volley training

Change-Id: I60c8e6c9c6a26fafe290105f9d64061d694ecc1b
 2016-05-26 02:48:16 +00:00
Trevor Johns
5c6eac02e4 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 am: 5513b6776e 
am: e135e9b1b7

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

Change-Id: I5e0a61ee98e45d71b5d796f0fa1418b8ddab87f2
 2016-05-26 02:48:14 +00:00
Trevor Johns
e135e9b1b7 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 
am: 5513b6776e

* commit '5513b6776e0b00fd0444cf4f964451d0ef61a511':
  docs: Fix broken link in Volley training

Change-Id: Ia030a066b44dfd842a8ea411001dbf454003fb20
 2016-05-26 02:36:42 +00:00
Trevor Johns
6e73a12804 docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e am: 46c1d5a5d2 
am: 5513b6776e

* commit '5513b6776e0b00fd0444cf4f964451d0ef61a511':
  docs: Fix broken link in Volley training

Change-Id: Iae7c07a4734cd822c13ba8a78d5bc8b311432eb9
 2016-05-26 02:36:37 +00:00
Trevor Johns
5513b6776e docs: Fix broken link in Volley training am: 05dd9d2c29 am: 346114e346 am: c8c2abed0e 
am: 46c1d5a5d2

* commit '46c1d5a5d2b4c1d6a680f7af5c3973486c1fef2c':
  docs: Fix broken link in Volley training

Change-Id: Ib5ae3925cca39db0145bb4c6e6eeb53488bfc316
 2016-05-26 02:19:23 +00:00
Android Build Merger (Role)
27bc36a8bc Merge "Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a am: ade0bce32a" into nyc-mr1-dev-plus-aosp 2016-05-26 02:18:47 +00:00
Adam Lesinski
afb018e836 Merge "Use app\'s best locale if they override LocaleList" into nyc-dev am: fbf3a0964a 
am: ade0bce32a

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

Change-Id: Ib573235d174892c714e6864d8f34ac3a909b2d1c
 2016-05-26 02:18:05 +00: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
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
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
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