Commit Graph

63566 Commits

Author SHA1 Message Date
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
Dianne Hackborn
8db0fc15b8 More work on issue #26390151: Add new JobScheduler API...
...for monitoring content providers

We now have some delays before reporting URI changes, to allow
them to batch together.

Also clean up debug output, and fix some issues with how we
were managing the content observer state.

And while I am here, fix the device idle and app idle controllers
to no longer maintain their own list of jobs, but just directly
iterate over the JobStore.

Change-Id: If3fdff23c00c2f1b99901a9be096d851562d3439
2016-04-13 10:54:16 -07:00
Dianne Hackborn
3ba3ad2188 Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev
am: e3f617b

* commit 'e3f617b23f202e11d4ee67d322609ee7b07b11bb':
  Fix issue #28035090: Disallow abuse of JobScheduler

Change-Id: I8ed129b1c5daabbddc57fdb95efdd15ba101184d
2016-04-13 17:49:32 +00:00
Sudheer Shanka
b53a36b8cf Merge "Add an intent action ACTION_SHOW_APP_INFO." into nyc-dev 2016-04-13 17:47:07 +00:00
Dianne Hackborn
e3f617b23f Merge "Fix issue #28035090: Disallow abuse of JobScheduler" into nyc-dev 2016-04-13 17:44:52 +00:00
Dianne Hackborn
807de78c07 Fix issue #28035090: Disallow abuse of JobScheduler
We now keep track of how long each app has been running a job
for, in 30 minute batches.  If it is running jobs frequently,
we will bump down the priority its jobs run at to allow other
jobs to run before it.

Currently we count both pending and active as the job running,
which means that an app that has jobs waiting in the pending
queue will count against its abuse prevention.  This could
allow starvation -- if we bump down the priority of an app's
jobs and the system is so busy continually that they sit
in the pending queue a lot -- it could never recover.  But I
think that is okay...  if we are really in a state where we
are continually running as many jobs as possible, we probably
have other larger issues.

Change-Id: I838aa4b5840e91df49a1e17b53188d6e4a66a6d1
2016-04-13 10:42:51 -07:00
Siyamed Sinir
bd0e4e7b36 Merge "Fix StaticLayout left/right indent" into nyc-dev
am: 9dba546

* commit '9dba546d9aec4668b2b97cd15dc6fb35bc95ece6':
  Fix StaticLayout left/right indent

Change-Id: Ifdfe131f41b2b21b59f80ff651a0d34db94c7a43
2016-04-13 17:35:58 +00:00
Siyamed Sinir
9dba546d9a Merge "Fix StaticLayout left/right indent" into nyc-dev 2016-04-13 17:29:22 +00:00
Alan Viverette
147baca4aa Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev
am: a63d2db

* commit 'a63d2db09978387b2bfdd849034dc73d43647ded':
  Fall back to setting the level of the entire progress drawable

Change-Id: I4f1c109fc925e9d576fca9d7db4de6a43c3eedee
2016-04-13 17:28:28 +00:00
Alan Viverette
a63d2db099 Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev 2016-04-13 17:19:05 +00:00
Wale Ogunwale
361124ef08 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
am: 3fb1c81

* commit '3fb1c81394f98b025b488774916b7580f9e31dab':
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.

Change-Id: If788ed4af5292b76576c7abd728633f20cc6eb93
2016-04-13 17:07:38 +00:00
Wale Ogunwale
3fb1c81394 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev
* changes:
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.
2016-04-13 16:59:36 +00:00
Henrik Engström
3277cf1ea4 Make ResolverActivity respect selector intent when making filters
When the ResolverActivity makes a filter after an intent is chosen,
either for remembering last used or an "always use" choice for the
user it doesn't consider the selector in the intent if present.

This means that when a resolver activity is launched for an intent
with a selector, the selector is used for resolving preferred
activities, and for populating the list, but when the same intent
is sent again it doesn't match the filter created by the previous
ResolverActivity.

This in turn means that the user will get another ResolverActivity
even if "Always Use" was chosen the last time.

Bug: 28129216

Change-Id: I29be7010e7c890caf9789673b3c3f821ba362761
2016-04-13 08:45:29 -07:00
Michael Wright
f58d81e640 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev
am: 52546e4

* commit '52546e46353f455d6a5bd070da6095868d7fc8bd':
  Crash early when requesting a keyboard shortcut helper...

Change-Id: Ia1be80e54af4c04af0c33ef2d03f7fc4e8dfee84
2016-04-13 14:02:50 +00:00
Michael Wright
52546e4635 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev 2016-04-13 13:58:16 +00:00
Michal Karpinski
96d49b1ac6 Merge "API polish in DPM for organization color and name methods" into nyc-dev
am: 1271cef

* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
  API polish in DPM for organization color and name methods

Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
2016-04-13 13:36:44 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Victor Chang
b2d707953a Merge "Update display text in cert notification" into nyc-dev
am: caf566a

* commit 'caf566a5372b05230885b787997b98ff4508eadd':
  Update display text in cert notification

Change-Id: I8c7459972fbdd2224f8eb68d01c7c63061b2256e
2016-04-13 10:22:27 +00:00
Victor Chang
caf566a537 Merge "Update display text in cert notification" into nyc-dev 2016-04-13 10:15:29 +00:00
Yohei Yukawa
bf0cf9d135 Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev
am: d0fae0d

* commit 'd0fae0d61d22608b4bfb0845e13ed9c07c5c5376':
  Improve captalization in InputMethodSubtype#getDisplayName().

Change-Id: Ifcbc689552b616482d236e88a512242d54704c20
2016-04-13 06:57:05 +00:00