Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,922 Commits 3 Branches 0 Tags
6501ac3bf9cfd8d940d2c36ab2df72bda1cab52e
Commit Graph

249922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
e3d6b69562 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 
am: 40585321d7

* commit '40585321d7b036ce7f609fbf10e8730deb1ad456':
  media: check profile, level and bitrate for isFormatSupported

Change-Id: I86e99d56a5048554fe02f9472f8e81dfe0fbc15a
 2016-05-26 06:27:34 +00:00
Lajos Molnar
40585321d7 Merge "media: check profile, level and bitrate for isFormatSupported" into nyc-dev 2016-05-26 06:14:04 +00:00
Dirk Dougherty
970446d0ac Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 am: 1cf99365cb 
am: a283dabdf5

* commit 'a283dabdf51427dfb5b8be0e6ab86292cb56b72d':
  Remove spurious url reference.

Change-Id: I3d702473090d1fdf9320d359dc0d6feb4eba47c6
 2016-05-26 05:53:48 +00:00
Dirk Dougherty
a283dabdf5 Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a am: a7c0788467 
am: 1cf99365cb

* commit '1cf99365cb98174bd4300c7f0c799e94f6aab907':
  Remove spurious url reference.

Change-Id: I744e556ebdb729314542dd9115346d42daf63e09
 2016-05-26 05:44:29 +00:00
Dirk Dougherty
1cf99365cb Merge "Remove spurious url reference." into mnc-mr-docs am: 1ed701493a 
am: a7c0788467

* commit 'a7c0788467d865e72ddbaa5862382d8ecc164039':
  Remove spurious url reference.

Change-Id: Ifb9a772d89c60124334b3a78a2f5864f879d104f
 2016-05-26 05:35:46 +00:00
Dirk Dougherty
a7c0788467 Merge "Remove spurious url reference." into mnc-mr-docs 
am: 1ed701493a

* commit '1ed701493a6363c58b86de8dac600fca990a131a':
  Remove spurious url reference.

Change-Id: I6b304fe5f87804f9c0d4de9bfef92437810ac9ea
 2016-05-26 05:17:01 +00:00
Hyunyoung Song
38fdd605c8 Replace caribou wallpaper without the stars 
b/28339724

Change-Id: I1c7f9024ffbdd51f675996ef156bc4882588da30
 2016-05-25 22:10:55 -07:00
Dirk Dougherty
1ed701493a Merge "Remove spurious url reference." into mnc-mr-docs 2016-05-26 05:03:25 +00:00
Chad Brubaker
62ac808954 Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 am: 11b56641e5 
am: 86bceb87ca

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

Change-Id: Id4b8b2a06cd2cbebcd47964e05157199c9cf9b31
 2016-05-26 05:00:35 +00:00
Joe Fernandez
67f2e2cc90 Merge "docs: Remove Advertising ID page and redirect to GMS reference docs" into mnc-io-docs am: 9e823c7048 am: 1a045584d4 
am: 68fb46153f

* commit '68fb46153f8649e2d4027a5e79cfc1786764a746':
  docs: Remove Advertising ID page and redirect to GMS reference docs

Change-Id: I7ff0d7995f26d9e47609322f91a9ac71c9b2b80d
 2016-05-26 05:00:12 +00:00
Chad Brubaker
86bceb87ca Merge "Merge "Track changes to network security config manifest configuration" into mnc-mr-docs am: c0f99aebdc" into mnc-io-docs am: ce99e3c571 
am: 11b56641e5

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

Change-Id: I25e463154d084223dbafdf3e2ab99bfdb52769fb
 2016-05-26 04:47:44 +00:00
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
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
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
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
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
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
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
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
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
TreeHugger Robot
bc983c4431 Merge "N is API 24" into nyc-dev 2016-05-26 01:03:08 +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
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
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
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
Sid Soundararajan
7cb7a0aa60 Merge "Make content descriptions of task cards, the title description" into nyc-dev 2016-05-26 00:45:28 +00:00
Dianne Hackborn
dbcca24f8e Merge "Fix issue #28964589: Binding dies when (unrelated) component is disabled in package" into nyc-dev 2016-05-26 00:43:33 +00:00
Alan Viverette
8f0ab27570 Merge "Fix borderless colored button text color" into nyc-dev 2016-05-26 00:40:19 +00:00
Andrii Kulian
e2a0c9437c Merge "Fix exception when trying to update config of detached stack" into nyc-dev 
am: a1984286d3

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

Change-Id: Id7fca21dc2a23206e2b241f90ac1119cf5281e18
 2016-05-26 00:36:19 +00:00
Chris Tate
84dd33d8e5 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

* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
  Backport of backup transport whitelist

Change-Id: Iaac686d1ac503ab9799a1de1d10f8bb874d8199a
 2016-05-26 00:34:16 +00:00
Stephan Linzner
347d660ce2 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 
am: dac0708ea0

* commit 'dac0708ea0efab696cd772ab346becbcc03232e6':
  Un-deprecated Android mock testing APIs

Change-Id: I21d0f3a65af94074ba477d4acaa20ff9686f9f5c
 2016-05-26 00:33:05 +00:00
Andrii Kulian
a1984286d3 Merge "Fix exception when trying to update config of detached stack" into nyc-dev 2016-05-26 00:24:10 +00:00
Android Build Merger (Role)
36a1b38e89 Merge "Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 am: 38a37f336f -s ours" into nyc-dev 2016-05-26 00:24:01 +00:00
Chris Tate
dbda4c2f9a Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8 
am: 38a37f336f  -s ours

* commit '38a37f336f96896146efc1a85310504bf4f77116':
  Backport of backup transport whitelist

Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8
 2016-05-26 00:22:47 +00:00
TreeHugger Robot
dac0708ea0 Merge "Un-deprecated Android mock testing APIs" into nyc-dev 2016-05-26 00:22:29 +00:00
Phil Weaver
062d24f9ec Merge "Improve accessibility window title behavior" into nyc-dev 
am: 7ab1a4d286

* commit '7ab1a4d286898acffd1f3b444f9efc9e1d2a104e':
  Improve accessibility window title behavior

Change-Id: I29286da845751351f3dcf603efb12441a6efe74e
 2016-05-26 00:18:34 +00:00