Commit Graph

64620 Commits

Author SHA1 Message Date
Paul Crowley
f75a03dd30 Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev am: f829c1463b
am: 05190e3bbf

* commit '05190e3bbf43cc95abf7bf103644d121317a3a00':
  Revert "Two phases to set the password for disk encryption"

Change-Id: I59cccbbef2c5af884ac83546f075d1dea95f6b23
2016-05-10 21:17:03 +00:00
Paul Crowley
05190e3bbf Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev
am: f829c1463b

* commit 'f829c1463b4805545d15924ad6243b9405eb83d6':
  Revert "Two phases to set the password for disk encryption"

Change-Id: Ic57b08d344020d9705a4bc2208b4adabebbe9151
2016-05-10 21:13:55 +00:00
Antonio Cansado
8b2dd44f2f Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev am: dc5f558640
am: 7598ac2aa7

* commit '7598ac2aa79f328e52e58bdaa2d8e8d858c2c463':
  Addressing API council comments on NetworkStatsManager.

Change-Id: Ia886e1ce98520c1618ba501097a2c979a628bbb4
2016-05-10 21:08:25 +00:00
Paul Crowley
f829c1463b Merge "Revert "Two phases to set the password for disk encryption"" into nyc-dev 2016-05-10 21:07:59 +00:00
Antonio Cansado
7598ac2aa7 Merge "Addressing API council comments on NetworkStatsManager." into nyc-dev
am: dc5f558640

* commit 'dc5f558640da8785fabc274167ec37a0fda30cd6':
  Addressing API council comments on NetworkStatsManager.

Change-Id: I952e69e7cfbd8cebcbac7c3b19ede300e26777e8
2016-05-10 21:05:17 +00:00
Paul Crowley
a1eb750e75 Revert "Two phases to set the password for disk encryption"
This reverts commit 17e5dce511.

Bug: 28694324
Change-Id: I6d89bc26cb429b195c9bcf640666c495617257b7
2016-05-10 20:36:56 +00:00
Phil Weaver
ae6d46419d Merge "Reduce cost of a11y services with magnification." into nyc-dev am: cdaaaaad90
am: 905c159749

* commit '905c1597492f607fda5a34ea0b3610ca4e793a67':
  Reduce cost of a11y services with magnification.

Change-Id: I07454b1ea47f99893dfa590f27b48793f1fea435
2016-05-10 20:28:09 +00:00
Phil Weaver
905c159749 Merge "Reduce cost of a11y services with magnification." into nyc-dev
am: cdaaaaad90

* commit 'cdaaaaad905396e4f0f2ebd9b37240095182d1d7':
  Reduce cost of a11y services with magnification.

Change-Id: Ib93769bbbce508d0eae77cd830d361e5e686de47
2016-05-10 20:25:31 +00:00
Antonio Cansado
6965c1869a Addressing API council comments on NetworkStatsManager.
Callbacks
 - DataUsageCallback renamed to UsageCallback
 - DataUsagePolicy removed; passing in params directly to register method
 - making it an abstract class
 - passing in (networkType, subscriberId) that reached its threshold
 - renaming onLimitReached to onThresholdReached to match existing naming
 - only monitor single network,subscriberId
 - no monitoring of specific uids; using device or user wide instead

Tags
 - only owner uid can read its tags
 - exposing only TAG_NONE to match service side

BUG: 27530098

Change-Id: I2b2664da71806868a1e937d2bf4d1f234637509b
2016-05-10 13:24:16 -07:00
Phil Weaver
cdaaaaad90 Merge "Reduce cost of a11y services with magnification." into nyc-dev 2016-05-10 20:18:12 +00:00
Andreas Gampe
962906b6b7 Merge "Frameworks/base: Shorten system property" into nyc-dev am: a8f51e3e46
am: ddaeb30d5b

* commit 'ddaeb30d5b7c4e11a7c419db85c07c813b3d6195':
  Frameworks/base: Shorten system property

Change-Id: Icfa9d162d88135d24cef8cefd77f72e7c2589910
2016-05-10 20:05:41 +00:00
Andreas Gampe
ddaeb30d5b Merge "Frameworks/base: Shorten system property" into nyc-dev
am: a8f51e3e46

* commit 'a8f51e3e46c705b0477bf20a8e417ab57e09afee':
  Frameworks/base: Shorten system property

Change-Id: I9e90c9ed260cd74f1585d5851c65a6c78f245daf
2016-05-10 20:02:44 +00:00
Andreas Gampe
a8f51e3e46 Merge "Frameworks/base: Shorten system property" into nyc-dev 2016-05-10 19:55:43 +00:00
Steve Elliott
17750ae86e Merge "decouple HCE from FEATURE_NFC" into nyc-mr1-dev
am: b8eb2c5608

* commit 'b8eb2c5608b782d9bfc4a65625c353d79188a680':
  decouple HCE from FEATURE_NFC

Change-Id: If99fea76a8713bb4f77ffe38523501efc34b0882
2016-05-10 19:54:43 +00:00
Andreas Gampe
eff0639345 Frameworks/base: Shorten system property
Otherwise it's too long.

Bug: 26877591
Change-Id: I741186a9fbea6ee50df6cef58d528ec58662c772
2016-05-10 12:52:53 -07:00
Steve Elliott
b8eb2c5608 Merge "decouple HCE from FEATURE_NFC" into nyc-mr1-dev 2016-05-10 19:49:00 +00:00
Dimitry Ivanov
8176ea65a5 Merge "Simplify permitted-path construction" into nyc-dev am: 6e2b3d158a
am: 22c0dcc253

* commit '22c0dcc253139a99dad9791ce4ab745e427760f6':
  Simplify permitted-path construction

Change-Id: If1a2f232fbd143c8e3f5f5175a528c411e484e19
2016-05-10 19:28:11 +00:00
Dimitry Ivanov
22c0dcc253 Merge "Simplify permitted-path construction" into nyc-dev
am: 6e2b3d158a

* commit '6e2b3d158a333b8754854314af0fc865a1f8bc5e':
  Simplify permitted-path construction

Change-Id: Ib3c67e6fd52ea847a194dfd3737c9cf2c75e17b7
2016-05-10 19:25:33 +00:00
Dimitry Ivanov
434f539224 Merge "Simplify permitted-path construction" into nyc-dev
am: 6e2b3d158a

* commit '6e2b3d158a333b8754854314af0fc865a1f8bc5e':
  Simplify permitted-path construction

Change-Id: I70ac68b50cd43cd5d725d9bb5df48b92f5edd624
2016-05-10 19:25:28 +00:00
Dimitry Ivanov
eb96b00382 Simplify permitted-path construction
The white list of permitted directories is applied for every
classloader namespace by libnativeloader. LoadedApk no longer
needs to do that.

Add mDataDir to permitted paths in the case if for any reason
it is outside of the whitelisted dirs.

Bug: http://b/28639227
Change-Id: I5b61ac64e281ecee3e3e9b1fe56cf04dc6ee7b25
2016-05-10 10:51:40 -07:00
Andreas Gampe
57cafdb556 Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev am: a2723ca88c
am: 2f67d686eb

* commit '2f67d686eb940300758fbee3d7d1aa19818a0aff':
  Frameworks/base: Make profile buffer adjustable

Change-Id: I4c8d20d51e22e587f129b37bd2bb922942fee2ae
2016-05-10 04:35:51 +00:00
Andreas Gampe
2f67d686eb Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev
am: a2723ca88c

* commit 'a2723ca88c630f62ac413e562fe335b5fc623f1c':
  Frameworks/base: Make profile buffer adjustable

Change-Id: Ica4a50834a2b1da2644e85d28ee1e7196c3feb2b
2016-05-10 04:30:22 +00:00
Andreas Gampe
9d3022c704 Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev
am: a2723ca88c

* commit 'a2723ca88c630f62ac413e562fe335b5fc623f1c':
  Frameworks/base: Make profile buffer adjustable

Change-Id: I161883b14055d64438ded935ffb1d8983dc862d3
2016-05-10 04:30:18 +00:00
Andreas Gampe
a2723ca88c Merge "Frameworks/base: Make profile buffer adjustable" into nyc-dev 2016-05-10 04:15:13 +00:00
Andreas Gampe
0f03a01ca3 Frameworks/base: Make profile buffer adjustable
Add a debug system property to change the profile buffer size.

Bug: 26877591
Change-Id: Idd13f2bc6563fd88daadd1d6679f3243dab1a0ef
2016-05-09 21:05:12 -07:00
Phil Weaver
2fbdd48682 Reduce cost of a11y services with magnification.
Services that declare that they can control magnification,
but never actually make a change or register a listener
waste cycles as we compute magnification data they never use.

Avoid registering for magnification callbacks unless magnification
gestures are enabled, a service is listening for magnification
changes, or a service has changed magnification.

Bug: 28425922
Change-Id: I114a833669bd53b2cd757c94ea52b65a2f838a08
2016-05-09 16:21:29 -07:00
Joe Onorato
64b2e26c4e Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev am: 3b25fd081d
am: bdff78d9ea

* commit 'bdff78d9eadf2e9c0f8333aa457ffeac3b947fa8':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: If90e8eb85bfd85e3f46c04de34f4d1f4db177673
2016-05-09 22:22:40 +00:00
Joe Onorato
bdff78d9ea Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: Iec6ad93e7445df5d642aba24867c264c435c53ba
2016-05-09 22:17:10 +00:00
Joe Onorato
0ee1a7e838 Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev
am: 3b25fd081d

* commit '3b25fd081d6af21b16ab4b96ead70766b3d78d06':
  Fix a couple bad links in the javadoc for android.os.health.

Change-Id: I27ccd973ff6a14387a11f19c30dcb5a3ae95b802
2016-05-09 22:17:08 +00:00
TreeHugger Robot
3b25fd081d Merge "Fix a couple bad links in the javadoc for android.os.health." into nyc-dev 2016-05-09 22:03:05 +00:00
Paul Crowley
5f0856afc3 Merge "Two phases to set the password for disk encryption" into nyc-dev am: 9aa6bb5a4a
am: d365ddbd73

* commit 'd365ddbd736729415df5a9b5823e74ad87ac2380':
  Two phases to set the password for disk encryption

Change-Id: I11a856a217d8313925385e2b053afe2356a4646e
2016-05-09 21:55:25 +00:00
Paul Crowley
d365ddbd73 Merge "Two phases to set the password for disk encryption" into nyc-dev
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic8102ebd218f387236aa5ef013ccdf4bc8f58ce1
2016-05-09 21:50:20 +00:00
Paul Crowley
017d8647ab Merge "Two phases to set the password for disk encryption" into nyc-dev
am: 9aa6bb5a4a

* commit '9aa6bb5a4a8bd00a175e8a9c338b52bc24a162b4':
  Two phases to set the password for disk encryption

Change-Id: Ic77d5608961b34993848fc71809a27001d919abc
2016-05-09 21:49:54 +00:00
Paul Crowley
9aa6bb5a4a Merge "Two phases to set the password for disk encryption" into nyc-dev 2016-05-09 21:35:34 +00:00
Steve Elliott
04141eac6b decouple HCE from FEATURE_NFC
Allows getting an instance of NfcAdapter through
NfcAdapter.getNfcAdapter on a device which has
FEATURE_NFC_HOST_CARD_EMULATION(_NFCF) but not FEATURE_NFC.

All non-HCE APIs will throw an UnsupportedOperationException if accessed
without FEATURE_NFC.

Bug: 24532713
Change-Id: I95c0309d8eea46f592b3c713541a3ed6e0f96aef
2016-05-09 21:19:03 +00:00
Joe Onorato
168638c594 Fix a couple bad links in the javadoc for android.os.health.
Bug: 28295754
Change-Id: I3b21e204bec626e4d1c6fb8f07580c2854e364eb
2016-05-09 13:32:32 -07:00
Joe Onorato
adf2a6240d Merge changes I04301fbd,If6577602 into nyc-dev am: ac29617c6e
am: 4240daca3a

* commit '4240daca3afe78652d775bf5431beb9e10c531d3':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I773937e0b0a5c1021e1c0716e06ec29f6f78a351
2016-05-09 20:22:40 +00:00
Joe Onorato
8b552ed03c Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: If9d0461325336f6c5cb6faca34bac17c8ef6a35e
2016-05-09 20:17:06 +00:00
Joe Onorato
4240daca3a Merge changes I04301fbd,If6577602 into nyc-dev
am: ac29617c6e

* commit 'ac29617c6e11085c9648d150a50c5daa15d65645':
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.

Change-Id: I28bae3d984af6d19852fb63eda5fb21c1b6c98dd
2016-05-09 20:16:56 +00:00
TreeHugger Robot
ac29617c6e Merge changes I04301fbd,If6577602 into nyc-dev
* changes:
  Flesh out the docs for the android.os.health package.
  Properly blame the correct uid for wakeup alarms that don't have a WorkSource.
2016-05-09 20:05:13 +00:00
Tyler Gunn
824697c339 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev
am: b6029e3ba5

* commit 'b6029e3ba54a73bd95ef63caa337e00b8951e024':
  Un-@hide multi-endpoint APIs.

Change-Id: I9f8e5f933b12b523a81c40e8ff5ac4b8b972228f
2016-05-09 18:18:55 +00:00
Tyler Gunn
b6029e3ba5 Merge "Un-@hide multi-endpoint APIs." into nyc-mr1-dev 2016-05-09 18:12:45 +00:00
Joe Onorato
181cada18a Flesh out the docs for the android.os.health package.
Bug: 28295754
Change-Id: I04301fbdbfb0708172adb4fd4b4a3658d5ea14eb
2016-05-09 10:32:31 -07:00
Alan Viverette
93b15870d5 Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev am: d8c38b892b
am: 3f9d17fbe1

* commit '3f9d17fbe1614267dd25ac46d973acb205175cd7':
  Cancel animation and jump to current state if not animating picker

Change-Id: I6834b9dfdde724dab3fe69a1467338f7c100ea99
2016-05-09 14:18:06 +00:00
Alan Viverette
3f9d17fbe1 Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
am: d8c38b892b

* commit 'd8c38b892b86cc9cb94633b6f9d74126e2d53c60':
  Cancel animation and jump to current state if not animating picker

Change-Id: Icdc36f4f5133b16a1b15d7cf58d1e0ef21fe9b7e
2016-05-09 14:14:33 +00:00
Alan Viverette
784aa1498f Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev
am: d8c38b892b

* commit 'd8c38b892b86cc9cb94633b6f9d74126e2d53c60':
  Cancel animation and jump to current state if not animating picker

Change-Id: I20684e1e974e1d5f8f6987ca9eac17d3da470763
2016-05-09 14:14:33 +00:00
Alan Viverette
d8c38b892b Merge "Cancel animation and jump to current state if not animating picker" into nyc-dev 2016-05-09 14:06:29 +00:00
Felipe Leme
9f144cb395 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev am: 638a6e8140
am: 87d20317bf

* commit '87d20317bf26e87ef58798d3c5aafb81aa163788':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: Ifeb332fbf00c554b78d0ad724b34e3a8ebfc9894
2016-05-06 23:43:55 +00:00
Felipe Leme
87d20317bf Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I5d3fdbbff6d92be9657d3ed466462ca911d20881
2016-05-06 23:39:09 +00:00
Felipe Leme
9a48ee1b3e Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev
am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I0fd66b16c83680940f294ea8e117443ffd8a50cd
2016-05-06 23:38:59 +00:00