Commit Graph

63589 Commits

Author SHA1 Message Date
Clara Bayarri
bdcd8dce23 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev
am: 6e58549

* commit '6e5854974098e4e2f734510e7dd8221a324f34ad':
  Provide startIntentSenderForResult for fragments

Change-Id: I363540141afa80476fe0db79103c0df08794a5ae
2016-04-14 10:11:15 +00:00
Clara Bayarri
6e58549740 Merge "Provide startIntentSenderForResult for fragments" into nyc-dev 2016-04-14 10:05:35 +00:00
Bernard Chau
d17b3013ce Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev
am: 25c43b7

* commit '25c43b78d11f74e98ba9d5f541647aa5ed44ebce':
  Includes both direct boot aware and unaware apps in Apps default view

Change-Id: I23eeef915a4607aa387e826056056cb7632a4542
2016-04-14 09:45:55 +00:00
Bernard Chau
25c43b78d1 Merge "Includes both direct boot aware and unaware apps in Apps default view" into nyc-dev 2016-04-14 09:40:00 +00:00
Hugo Benichi
39de1e2de5 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev
am: fc18b6f

* commit 'fc18b6f3608d87f3dc53cda8d8db30636c92d6e9':
  Add DHCP error event class and record DHCP errors.

Change-Id: I5b9ef8b191ab0ef4349ed00c1d8f548393aba368
2016-04-14 08:08:54 +00:00
Hugo Benichi
fc18b6f360 Merge "Add DHCP error event class and record DHCP errors." into nyc-dev 2016-04-14 08:01:31 +00:00
Pierre Imai
f8ef3c36a9 Merge changes Ia71865a9,I40b6de54 into nyc-dev
am: 1feca76

* commit '1feca76bd48008aa3421c8741cb147ecc1a6e912':
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.

Change-Id: I2aea598dd2926c18fdb4e6301759539c504038dc
2016-04-14 07:31:38 +00:00
Pierre Imai
1feca76bd4 Merge changes Ia71865a9,I40b6de54 into nyc-dev
* changes:
  Log an event whenever we lose the default network.
  Record the transport types for connectivity events.
2016-04-14 07:25:34 +00:00
Hugo Benichi
6241874355 Add DHCP error event class and record DHCP errors.
This patch adds an event class derived from IpConnectivityEvent that
records parsing errors of DHCP response packets.

Change-Id: I19516cf05e3419c4262e3236899e52987e5f2264
2016-04-14 15:40:10 +09:00
Pierre Imai
6b4e15b155 Record the transport types for connectivity events.
BUG: 25691077
Change-Id: I40b6de5446325e717c0356603fd66cd395db9acb
2016-04-14 15:38:17 +09:00
Zhijun He
a19762765d Merge "Camera: clarify lens shading map" into nyc-dev
am: 15aac69

* commit '15aac69c8f16e5edd62fd6557cf6ffb5e04b351e':
  Camera: clarify lens shading map

Change-Id: I403577261078949cb30c0a66390e833108d3b98f
2016-04-14 05:26:18 +00:00
Zhijun He
15aac69c8f Merge "Camera: clarify lens shading map" into nyc-dev 2016-04-14 05:20:45 +00:00
Yuki Awano
b28d871a8d Do not update accessibilityTitle in LayoutParams.setTitle
am: 0697c7a

* commit '0697c7a877d87acd572ed7ce62472d5866375e86':
  Do not update accessibilityTitle in LayoutParams.setTitle

Change-Id: I006620e1ac9c8571dd698f45da75284010dc58e9
2016-04-14 04:21:55 +00:00
Yuki Awano
0697c7a877 Do not update accessibilityTitle in
LayoutParams.setTitle

Bug: 28126629
Change-Id: Idfd8c0210d32e1a0e9c16272cfbb35ef6065e805
2016-04-14 04:16:18 +00:00
Erik Kline
48f8f2951b Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev
am: f824e58

* commit 'f824e58d493bb86789bcb8de27a2e43a762c5d3e':
  Add some more metrics: IpManager, IpReachabilityMonitor

Change-Id: Icc62c058b26a8b31f3651569371dbb231cef4502
2016-04-14 03:27:17 +00:00
TreeHugger Robot
f824e58d49 Merge "Add some more metrics: IpManager, IpReachabilityMonitor" into nyc-dev 2016-04-14 03:20:40 +00:00
Erik Kline
5b25a0f796 Add some more metrics: IpManager, IpReachabilityMonitor
Change-Id: Ibb7150c849715a42fc2c879589eaaf86e8a007e7
2016-04-14 10:53:30 +09:00
Alan Viverette
3b049bb17f Merge "Add scroll indicators to resolver list" into nyc-dev
am: 8bb7ad5

* commit '8bb7ad598560fda42ec256f02ba69cf54b433a85':
  Add scroll indicators to resolver list

Change-Id: I8b6dbcd2ff106bf83945084b1a4956c094234240
2016-04-14 01:49:33 +00:00
Alan Viverette
8bb7ad5985 Merge "Add scroll indicators to resolver list" into nyc-dev 2016-04-14 01:45:35 +00:00
Steven Dao
f917e2f738 Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev
am: c1699a9

* commit 'c1699a9f4cf679ebc87e5b5bc99dd07446950be7':
  Populate RangeInfo correctly when acquiring from pool

Change-Id: I0227f6b9a842fa1e63827cda51e0cb5a435e278e
2016-04-14 00:34:13 +00:00
TreeHugger Robot
c1699a9f4c Merge "Populate RangeInfo correctly when acquiring from pool" into nyc-dev 2016-04-14 00:28:28 +00:00
Adrian Roos
69df48c446 Merge "StrongAuthTracker: Don\'t rely on USER_PRESENT" into nyc-dev
am: c142a8c

* commit 'c142a8c43fa7d1b6c9d797e044060755d9ecfcd6':
  StrongAuthTracker: Don't rely on USER_PRESENT

Change-Id: Id81115f8311e797f0b7d8a435226ea5862a9550a
2016-04-14 00:08:08 +00:00
TreeHugger Robot
c142a8c43f Merge "StrongAuthTracker: Don't rely on USER_PRESENT" into nyc-dev 2016-04-14 00:04:54 +00:00
Dianne Hackborn
034b58c2f5 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev
am: 9e31b3f

* commit '9e31b3fd817aed28d9afd712fa49ec9d6fc11329':
  More work on issue #26390151: Add new JobScheduler API...

Change-Id: I7c227898d175c15219192fc42c5e4eb5121e9517
2016-04-13 23:37:31 +00:00
Dianne Hackborn
9e31b3fd81 Merge "More work on issue #26390151: Add new JobScheduler API..." into nyc-dev 2016-04-13 23:30:14 +00:00
Doris Liu
f4b5a9d7f6 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev
am: c5801fb

* commit 'c5801fb9333823f08889f82eb4679638d18d6863':
  Add api check to guard AnimatorSet behavior change

Change-Id: If3d6417d60c70161869e41aa94f89e2afee9bd33
2016-04-13 23:19:43 +00:00
Jonathan Basseri
ea1598173a Merge "Add toString to CarrierIdentifier." into nyc-dev
am: 71f69a7

* commit '71f69a71ffd77367a53721fcaed015cba942f5c3':
  Add toString to CarrierIdentifier.

Change-Id: I1b0d7e0d117b0aa10482ec0ddc52a4531e570b70
2016-04-13 23:19:41 +00:00
Doris Liu
c5801fb933 Merge "Add api check to guard AnimatorSet behavior change" into nyc-dev 2016-04-13 23:15:33 +00:00
Junda Liu
71f69a71ff Merge "Add toString to CarrierIdentifier." into nyc-dev 2016-04-13 23:14:41 +00:00
Doris Liu
677b2c60aa Merge "Skip to end for 0-duration animation" into nyc-dev
am: 1dfe35b

* commit '1dfe35b8a797f921d095beeaf1018f7a987e8343':
  Skip to end for 0-duration animation

Change-Id: I22f0cbf98b69b24b07de001bfebb86ad06c2170b
2016-04-13 23:13:21 +00:00
Doris Liu
1dfe35b8a7 Merge "Skip to end for 0-duration animation" into nyc-dev 2016-04-13 23:03:30 +00:00
Adrian Roos
4ab7e595a5 StrongAuthTracker: Don't rely on USER_PRESENT
USER_PRESENT is sent via the background queue. A delay
there can cause us not to recognize that the user has
unlocked and prompt for the credential again, when trust
or fingerprint would be sufficient.

Also removes an obsolete reference to USER_PRESENT from
TrustManagerService.

Change-Id: Ie8d1a180170df5f0c8f9e71660504fd71eeacd99
Fixes: 27830458
2016-04-13 15:38:18 -07:00
Steven Dao
24142819b8 Populate RangeInfo correctly when acquiring from pool
Bug: 27136599
Change-Id: I836b2ae3bf9b2ed5fc4afeb744e2cf3a500cc4a4
2016-04-13 15:30:00 -07:00
Adam Lesinski
eaf83ef61b Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: b5abb78

* commit 'b5abb78b7c329069d5d5e7fd9c6a6e5e81f79c90':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I9b2e5d8488f15a400287f8cfacc3531bdb007068
2016-04-13 22:25:45 +00:00
Adam Lesinski
b5abb78b7c Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev 2016-04-13 21:53:47 +00:00
Henrik Engström
7d7a075ec9 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev
am: 651e09f

* commit '651e09fdc1b4c26dc7661e1ab127276656ece041':
  Make ResolverActivity respect selector intent when making filters

Change-Id: I4bf1b16e6afb07c7c9bd0172539efa32dc14724e
2016-04-13 21:46:07 +00:00
Jonathan Basseri
b1a43484d5 Add toString to CarrierIdentifier.
This is so that objects can be logged and included in dumpsys.

Bug: 26778049
Change-Id: Iace574e40e7a7a7a06289592de9a51455b6acb18
2016-04-13 21:36:52 +00:00
Adam Powell
651e09fdc1 Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev 2016-04-13 21:35:33 +00:00
Doris Liu
56b0b57089 Skip to end for 0-duration animation
Repeating a 0-duration animation makes no sense. In the case of
battery saver mode, all animators are set to 0 duration, and
repeating the 0 duration animations not only waste battery power
but also potentially produce flickers on screen. In this CL,
0-duration animations are skipped to the end, regardless their
repeat count.

Bug: 25451472
Change-Id: I20f9dc2f0ff9c027782a8363ff4cf4a4d390736c
2016-04-13 14:13:49 -07:00
Yin-Chia Yeh
b2bbd2114d Merge "Camera: update expectation of post RAW sensitivity control" into nyc-dev
am: 11aade9

* commit '11aade9f6e82844d494c43a5ad0bbae87cbf9601':
  Camera: update expectation of post RAW sensitivity control

Change-Id: I87aada74f3c4780a037872af737b61b1e2c6bb74
2016-04-13 20:43:40 +00:00
Doris Liu
58606db8be Add api check to guard AnimatorSet behavior change
For pre-N, we have inconsistent behavior between ValueAnimator and
AnimatorSet in the case of calling end() when already ended:
ValueAnimator would start() and immediately end, whereas AnimatorSet
would be no-op. We made a decision to be consistent within Animation
Framework from N forward, which means that AnimatorSet will have the
new behavior of starting and immediately ending just like
ValueAnimator. This new behavior will be guarded by an API check.

Bug: 25601129
Change-Id: I2d952a93d8521c547ec8cde173c80d1d8ead0639
2016-04-13 13:37:45 -07:00
Yin-Chia Yeh
11aade9f6e Merge "Camera: update expectation of post RAW sensitivity control" into nyc-dev 2016-04-13 20:33:48 +00:00
Adam Lesinski
5520581b5f Optimize ResTable::getLocales() to improve bindApplication performance
Change from linear searching for uniqueness to binary search.

Bug:27198799
Change-Id: Ifa4672929df286c4693ab1f77716f08945941b0c
2016-04-13 13:25:09 -07:00
Sudheer Shanka
0306304100 Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev
am: fd580f7

* commit 'fd580f7d1a5a19b062bea49602f0f6136bce7e5e':
  Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence.

Change-Id: Ia7286ea72f55ec5e717785ecd30c05f6ae92d673
2016-04-13 20:21:34 +00:00
Sudheer Shanka
fd580f7d1a Merge "Update {set,get}{Long,Short}SupportMessage APIs to use CharSequence." into nyc-dev 2016-04-13 20:12:05 +00:00
Robert Carr
482fb889fa Merge "Correct PopupWindow spaceAbove calculation." into nyc-dev
am: caa747b

* commit 'caa747b9ac0076f52d01f0c3929cb8e56ff6d3b9':
  Correct PopupWindow spaceAbove calculation.

Change-Id: I87eb75252c9cffd64fb281646d249443eda47c74
2016-04-13 19:00:06 +00:00
Rob Carr
caa747b9ac Merge "Correct PopupWindow spaceAbove calculation." into nyc-dev 2016-04-13 18:55:00 +00:00
Mitchell Wills
53560db137 Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev
am: 3c58709

* commit '3c5870912b6dc20e13c3af5e078a600b88904e99':
  Make WifiScanner state not static and use ConnectivityThread

Change-Id: Ia2c6bb955461884e88d13af885e0011fcafec7b5
2016-04-13 18:53:05 +00:00
Mitchell Wills
3c5870912b Merge "Make WifiScanner state not static and use ConnectivityThread" into nyc-dev 2016-04-13 18:41:55 +00:00
Sudheer Shanka
dab38b0aaa Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev
am: b53a36b

* commit 'b53a36b8cf331b0edd73909c42024fac0984ffcc':
  Add an intent action ACTION_SHOW_APP_INFO.

Change-Id: Ice3c78b6b45dceba83462175bd294898b7b1bea0
2016-04-13 17:56:37 +00:00