Commit Graph

253881 Commits

Author SHA1 Message Date
Makoto Onuki
7bdb9ce978 Fix system crash due to mismatching begin/finishBroadcast()
Bug 31449363

Change-Id: I514196355a2566c5e4f7f3af91fbf3c57cb67a48
2016-09-15 12:59:43 -07:00
Robert Shih
3b82056fca Merge "MediaExtractor: clarify EOS behavior for local files" into nyc-mr1-dev 2016-09-15 19:57:20 +00:00
rago
8dc9afa966 Fix scope for visualizer object release
Bug: 30684284
Change-Id: I4170511c6c7f36aa1bce3e439054bc6b8a4a2623
2016-09-15 12:12:27 -07:00
Patrick Baumann
2baf095ca9 Adding advanced pattern support to PatternMatcher
This change adds a new pathMatch attribute to the intent-filter tag
that supports a subset of regular expression syntax. Supported
tokens include dot (.) and set ([]) and supported modifiers include
zero-or-more (*), one-or-more(+) and ranges ({}).

Change-Id: I2ec3bc8a9eb3e94d21caf34a1ed0f3fd3fb33a35
Bug: 30805203
2016-09-15 11:17:54 -07:00
Julia Reynolds
7ca068feeb Merge "Non-blockable notification packages." into nyc-mr1-dev 2016-09-15 17:01:56 +00:00
Dan Yu
92581b332e Merge "docs: Add docs on OnboardingFragment" into nyc-dev am: f3f6921b57
am: 4802f77335

Change-Id: Iaef0eff44fd3c8d1007e4aa9ab1f9465fabf574c
2016-09-15 16:28:27 +00:00
Daniel Yu
4d18d5519e docs: Add docs on OnboardingFragment am: d64f8bfe1f
am: 31d62b3284

Change-Id: I8a05e9836dfb02375157b0685cd21ef071328815
2016-09-15 16:28:23 +00:00
Dan Yu
4802f77335 Merge "docs: Add docs on OnboardingFragment" into nyc-dev
am: f3f6921b57

Change-Id: I4ee66e11815954bc5566004536cdc7c5c6ba5639
2016-09-15 16:22:12 +00:00
Daniel Yu
31d62b3284 docs: Add docs on OnboardingFragment
am: d64f8bfe1f

Change-Id: I5d4a7269c6b33604888a5df6f14a728caef7ef7b
2016-09-15 16:22:05 +00:00
Dan Yu
f3f6921b57 Merge "docs: Add docs on OnboardingFragment" into nyc-dev 2016-09-15 16:13:22 +00:00
Lorenzo Colitti
40b707ed39 Unit tests for avoid bad wifi networks setting.
am: 73b20938c7

Change-Id: I6491f1a93f93f222e23ef6e5e437631556637e44
2016-09-15 16:05:45 +00:00
Lorenzo Colitti
d660913b0b Support displaying a dialog when wifi becomes unvalidated.
am: 9be58c5580

Change-Id: I8b8e2b652510ca75407a9ad3c29ed111367941e0
2016-09-15 16:04:03 +00:00
Lorenzo Colitti
cdf48a5f69 Merge "Support ignoring penalty for bad wifi networks" into nyc-dr1-dev
am: def7f61932

Change-Id: Ia3c2a115b3c925da1414703667efe39aaa594b46
2016-09-15 15:23:59 +00:00
Hugo Benichi
c53b5964f8 Support ignoring penalty for bad wifi networks
am: c8e9e1229a

Change-Id: I6666ee45e9a08c02444c6268b2232bbe8aa2adec
2016-09-15 15:23:57 +00:00
Lorenzo Colitti
d15fe5cf28 Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev
am: 33a900a91d

Change-Id: I23931e80b52bd9921924d44b44c4df37c971f9e4
2016-09-15 15:23:53 +00:00
TreeHugger Robot
c3b538b762 Merge "resolve merge conflicts of f15b282 to nyc-mr1-dev" into nyc-mr1-dev 2016-09-15 15:20:14 +00:00
Lorenzo Colitti
73b20938c7 Unit tests for avoid bad wifi networks setting.
Bug: 31075769
Change-Id: I21ba20df59ddce5731ef1ebe8846b3f00578a674
2016-09-15 23:45:07 +09:00
Lorenzo Colitti
9be58c5580 Support displaying a dialog when wifi becomes unvalidated.
Bug: 31075769
Change-Id: I7a6e7580769365bea930f638bd44edcaa28df134
2016-09-15 23:33:34 +09:00
Lorenzo Colitti
def7f61932 Merge "Support ignoring penalty for bad wifi networks" into nyc-dr1-dev 2016-09-15 14:06:00 +00:00
Lorenzo Colitti
b8167f6b7e resolve merge conflicts of f15b282 to nyc-mr1-dev
Change-Id: Ib1294563c6ae20454e44bfa5fc9fb2797864b8f5
2016-09-15 22:47:08 +09:00
Yuqian Li
f317efdadc Merge "Ignore HasAlphaLayer flag to fix b/30929229" into nyc-mr1-dev 2016-09-15 13:47:01 +00:00
Lorenzo Colitti
33a900a91d Merge "Explicitly pass old score to updateCapabilities" into nyc-dr1-dev 2016-09-15 12:35:32 +00:00
Michal Karpinski
0b72a722ed Fingerprint Strong auth timeout
Allows PO and DO configure strong auth timeout for fingerprint.

Bug: 31430135
Change-Id: Ie6451d49aa95527adc3720d9a2a0848f58940510
(cherry picked from commit 8f010dd25d)
2016-09-15 12:01:26 +00:00
Hugo Benichi
c8e9e1229a Support ignoring penalty for bad wifi networks
This patch adds a way to configure devices so that a validated network
that becomes unvalidated is not penalized in the network scoring and
selection logic.

The intent is to prevent devices configured to do so from switching to a
lower scoring network such as cellular networks when a higher scoring
network such as wifi networks loses internet connectivity.

Bug: 31075769
Change-Id: Ie7e0f2607d214a178367fedfbef6c44768fa00a4
2016-09-15 18:34:13 +09:00
Hugo Benichi
f15b2824b6 Explicitly pass old score to updateCapabilities
This allows simplification of getCurrentScore function in
NetworkAgentInfo and its return value to depend on everValidated and
lastValidated.

Bug: 31075769
Change-Id: I0b3c85e3a61b006733e900e0a231424878317476
2016-09-15 18:33:23 +09:00
Scott Main
068b3b4ab9 Merge "Revert "add dev guide for constraint layout."" into nyc-dev am: a688419378
am: d320605bde

Change-Id: Ie36c3045c17dc45b118f72b7ee70b6764d271cca
2016-09-15 03:51:36 +00:00
Scott Main
f8c3e4c270 Revert "add dev guide for constraint layout." am: e6469e8211
am: cafc00f7df

Change-Id: Id6613682eebc651600dce5530e3bdf538b104190
2016-09-15 03:51:34 +00:00
Scott Main
d320605bde Merge "Revert "add dev guide for constraint layout."" into nyc-dev
am: a688419378

Change-Id: I910b8c015c547320dd1c62d60214ee9a85d0eddd
2016-09-15 03:43:25 +00:00
Scott Main
cafc00f7df Revert "add dev guide for constraint layout."
am: e6469e8211

Change-Id: I75c75dc27464ded7555644e16834421cdd6ffa4f
2016-09-15 03:43:21 +00:00
Scott Main
a688419378 Merge "Revert "add dev guide for constraint layout."" into nyc-dev 2016-09-15 03:38:42 +00:00
Scott Main
e6469e8211 Revert "add dev guide for constraint layout."
studio 2.2 launch delayed

This reverts commit 346f6d395c.

Change-Id: I61a555ed3f804dfdc4ef3e9a84e869154206639d
2016-09-15 03:37:37 +00:00
chchao
37ee5c796e In AccessibilityGestureDetector.clear(), dispatch a MotionEvent.ACTION_CLEAR event to mGestureDetector to cancel the ongoing gesture.
b/30706806

Change-Id: I78954e5484d8deda2dadb7c0ae7e05d5c6b734f2
2016-09-14 17:15:35 -07:00
Hongming Jin
fca6ec8e83 Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev am: 0c04977949
am: 702b0cb04a

Change-Id: I24e515682ee7903bf2b1f68d0ba00490d48bb6aa
2016-09-14 23:32:31 +00:00
Hongming Jin
adc906206a Only return password for account session flow if the caller is signed with system key and have get_password permission. am: 9342e137c6
am: 8b75ebf0bb

Change-Id: I95794bb5269c849fe740576a344e43da4306ac56
2016-09-14 23:32:29 +00:00
Robert Shih
e6b987c569 MediaExtractor: clarify EOS behavior for local files
Bug: 30726795
Change-Id: Iecd0ceb2bd0e32e0ae3387c534e181a2daf2005b
2016-09-14 23:30:27 +00:00
Jason Monk
6618428306 Merge "Change bang to x for indication of no internet" into nyc-dr1-dev
am: 72ed4c3735

Change-Id: Ic26c5d2dc64d3c53c9b5f12da7e4419336594ad6
2016-09-14 23:23:11 +00:00
Hongming Jin
702b0cb04a Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev
am: 0c04977949

Change-Id: I268b499addf728f53a4f8e66f84f45e3bfeed70f
2016-09-14 23:23:08 +00:00
Jason Monk
1fffffdf59 Change bang to x for indication of no internet
am: d67fbe6201

Change-Id: Ibeb766a13acfe74574009f6df1bac6d1bdd69268
2016-09-14 23:23:08 +00:00
Hongming Jin
8b75ebf0bb Only return password for account session flow if the caller is signed with system key and have get_password permission.
am: 9342e137c6

Change-Id: I932c85bdc302899b42342d3efc249a5420da764c
2016-09-14 23:23:05 +00:00
Hongming Jin
0c04977949 Merge "Only return password for account session flow if the caller is signed with system key and have get_password permission." into nyc-dev 2016-09-14 23:10:40 +00:00
Jason Monk
72ed4c3735 Merge "Change bang to x for indication of no internet" into nyc-dr1-dev 2016-09-14 22:35:54 +00:00
Jean-Michel Trivi
3fb30a2a43 Merge "MediaScanner: check build fingerprint for system sound scan" into nyc-mr1-dev 2016-09-14 22:23:26 +00:00
Scott Main
1b75cd3858 Merge "add dev guide for constraint layout." into nyc-dev am: 03ed8f30cb
am: 58af489c4c

Change-Id: Iae7f60db39619b90380082a1ebe0ef3b3acb2c30
2016-09-14 21:50:58 +00:00
smain@google.com
492fbb1386 add dev guide for constraint layout. am: 346f6d395c
am: 9189623177

Change-Id: I08e26134ddad4fb9f7fe5812c4f2cb10d8c50557
2016-09-14 21:50:54 +00:00
Scott Main
58af489c4c Merge "add dev guide for constraint layout." into nyc-dev
am: 03ed8f30cb

Change-Id: Id7b2a86f14499fe2d98ec3500fe3a790baec2a41
2016-09-14 21:44:42 +00:00
smain@google.com
9189623177 add dev guide for constraint layout.
am: 346f6d395c

Change-Id: Ide3d87ba6592605478ed12def37d9f63ad3f4e1d
2016-09-14 21:44:34 +00:00
Eric Schmidt
8350cbf824 docs: Fixed language directory issue localization
Bug: 31096141
Change-Id: I571669b752e89f252c80f87ba04a70a81b5f94fd
2016-09-14 14:42:22 -07:00
Sudheer Shanka
67e05b4d28 Fix deadlock in AcitivityManagerService.
Don't hold mPidsSelfLocked lock when calling
cleanUpApplicationRecordLocked.

Bug: 31463143
Change-Id: I421962cbfd7c466662edcef805c3e27321dc5a98
2016-09-14 14:37:14 -07:00
Scott Main
03ed8f30cb Merge "add dev guide for constraint layout." into nyc-dev 2016-09-14 21:33:11 +00:00
Eric Laurent
63e2d63817 Merge "AudioService: restore A2DP/wired headset auto selection" into nyc-mr1-dev 2016-09-14 21:19:18 +00:00