Commit Graph

61265 Commits

Author SHA1 Message Date
Makoto Onuki
cffb6041d2 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev am: 37087ad710
am: 51c7ce7531

* commit '51c7ce7531f5c1fc1ae442b1c6f206735599cea2':
  ShortcutManager: Implement usage report API

Change-Id: Ia713dbbb510d2f848b8866a4d0dc692f67803522
2016-06-03 15:44:53 +00:00
Makoto Onuki
51c7ce7531 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev
am: 37087ad710

* commit '37087ad710087755786c115508b14e053c47f882':
  ShortcutManager: Implement usage report API

Change-Id: I4ac336f441fa2111d1d645b02a79dc717490c1c0
2016-06-03 15:37:10 +00:00
Makoto Onuki
37087ad710 Merge "ShortcutManager: Implement usage report API" into nyc-mr1-dev 2016-06-03 15:21:45 +00:00
Tony Mak
7cf85ffc58 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43 am: fff6650de4
am: aefec202de

* commit 'aefec202de2a94ce2a624d72bd2036f7141b1af7':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I88bba620c3a3212ebf74ee0f884febc3ec923c1f
2016-06-03 11:07:38 +00:00
Tony Mak
aefec202de OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN am: 33d03a9e43
am: fff6650de4

* commit 'fff6650de4ac847db61ffdf3fbc82a39e3878313':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Id88584fff3f69e554793ea1e99dd491796a470ff
2016-06-03 10:54:46 +00:00
Tony Mak
fff6650de4 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: Ib8e3b7fae441adf95b928d7139455d3ca13c1fb6
2016-06-03 10:43:37 +00:00
Tony Mak
d73c6eb6f3 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
am: 33d03a9e43

* commit '33d03a9e435eb474e3bdd3e958943e0057866477':
  OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN

Change-Id: I2de02ec6febdc58ff9a79562059cc11e7d617be5
2016-06-03 10:43:30 +00:00
Tony Mak
33d03a9e43 OP_ACTIVATE_VPN should not map to DISALLOW_CONFIG_VPN
They are two different things.
OP_ACTIVATE_VPN means can we allow a vpn app to establish without user
interaction while DISALLOW_CONFIG_VPN means can the user modify vpn
config.

Testing:
1. Turn on DISALLOW_CONFIG_VPN, user cannot modify vpn config through
   setting
2. Turn on DISALLOW_CONFIG_VPN, Dpm.setAlwaysOnVpn works.
3. Reboot after 2, vpn established automatically.

Bug: 29086229
Change-Id: I24899d6c7f0dd62bf441a44c6ee66fee35973a11
2016-06-03 10:06:06 +00:00
Zhijun He
5745f4ce55 Merge "Camera2: add deferred output config support" into nyc-mr1-dev am: e8526a0105
am: f103fd540e

* commit 'f103fd540e54dddc370aa1049424a7644c889e08':
  Camera2: add deferred output config support

Change-Id: I7662286b333ccce5e18399fd84efb07e167936ea
2016-06-03 02:14:59 +00:00
Zhijun He
f103fd540e Merge "Camera2: add deferred output config support" into nyc-mr1-dev
am: e8526a0105

* commit 'e8526a01051fc2b8929870c8bff28f1d6b8b652c':
  Camera2: add deferred output config support

Change-Id: I5bfa1c90e4ab5910ccd3a8727b95200e4b4221ca
2016-06-03 02:07:10 +00:00
Zhijun He
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +00:00
Todd Kennedy
d2bbc1e2a0 Merge "Round icons" into nyc-mr1-dev am: 7d64d64269
am: a84b5d0ebd

* commit 'a84b5d0ebdeb7d4d5670d490380f5a7a48282b90':
  Round icons

Change-Id: Iff9a17b9f826053c31aaa6ada8fb167f8e4520b5
2016-06-03 00:44:54 +00:00
Todd Kennedy
a84b5d0ebd Merge "Round icons" into nyc-mr1-dev
am: 7d64d64269

* commit '7d64d642692ff6728ee83e1a0d8658909d1bdd44':
  Round icons

Change-Id: I5578f3eb7b7ffc7791a5a4305b0defba38963bba
2016-06-03 00:38:26 +00:00
TreeHugger Robot
7d64d64269 Merge "Round icons" into nyc-mr1-dev 2016-06-03 00:32:35 +00:00
Zhijun He
c8b181e95d Camera2: add deferred output config support
Allow surfaces to be deferred during session creation. Once the surfaces are ready,
the application can finish the deferred output configuration to be able to submit
requests with these surface targets.

Bug: 28323863
Change-Id: Id6634c3ef2ecc84422a88f63de0a19a0cb496e96
2016-06-02 17:30:20 -07:00
Todd Kennedy
bb8a42da70 Round icons
Allow applications to specify "android:roundIcon" in all places
they can already specify the rectangular "android:icon".

Bug: 28981414
Change-Id: I167163d650db80f4949274d365e7fee9aceacb3a
2016-06-02 15:57:54 -07:00
Makoto Onuki
ac042501c8 ShortcutManager: Implement usage report API
Bug 28536054

Change-Id: I293e8eaad523e3b0d76d562fc381601633451ed3
2016-06-02 15:57:40 -07:00
Svetoslav Ganov
0649158cad Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff am: 13f802dc01
am: a8cdb6f645

* commit 'a8cdb6f6453d23f915d5c470bbdf1000153df383':
  Properly set default voice interactor

Change-Id: I6310a3da7aeb0b8b78918399ef79a0fcc91d4792
2016-06-02 22:52:13 +00:00
Svetoslav Ganov
a8cdb6f645 Merge "Properly set default voice interactor" into nyc-dev am: e34bb5a1ff
am: 13f802dc01

* commit '13f802dc013866986be51328af21378783d19e61':
  Properly set default voice interactor

Change-Id: I29c2a1490877d4b25ca64fee8a53c6970d07a1f2
2016-06-02 22:47:29 +00:00
Svetoslav Ganov
bd28e027ed Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
2016-06-02 22:47:26 +00:00
Svetoslav Ganov
13f802dc01 Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff

* commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d':
  Properly set default voice interactor

Change-Id: I1e9d7488ecac8569a585e00ebc7c45df1b1833c3
2016-06-02 22:43:41 +00:00
Svetoslav Ganov
e34bb5a1ff Merge "Properly set default voice interactor" into nyc-dev 2016-06-02 22:36:05 +00:00
Svetoslav Ganov
b625e19a87 Properly set default voice interactor
We need to figure out the default voice interactor to give
it default permissions. This happens before the user has
been unlocked and if the voice interactor is not direct
boot aware we fail to find it, hence no permissions are
granted. Now we query the package manager for both direct
boot aware and unaware components. This is fine as we
don't interact with the assistant until the user is
unlocked.

bug:28963642

Change-Id: Ide5471fa1798e868c6e3a4b5e87570a5556e2d3f
2016-06-02 15:25:15 -07:00
Roozbeh Pournader
63c8d4904d Merge "Unhide CharSequence APIs to BidiFormatter" 2016-06-02 21:29:10 +00:00
Chong Zhang
bf4debc5fb Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1 am: 2f2af39911
am: 426fdee24e

* commit '426fdee24e618e0c97f3c61b3a57958aa66e416e':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: Ieb1d675a6a3ae93c1e56e26ba16e23bbe62d0010
2016-06-02 21:19:17 +00:00
Chong Zhang
426fdee24e Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev am: b1e24209f1
am: 2f2af39911

* commit '2f2af39911976974177e92099e27c10fe93beddd':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I145857ecc2a07ad1b7bb80334ff81c2d990bb199
2016-06-02 21:11:53 +00:00
Makoto Onuki
0a86dd6120 Merge "ShortcutManager: Implement max # of shortcuts" into nyc-mr1-dev am: a9f262d649
am: 4169184518

* commit '416918451846518d1ff42d45ad361a7b9df19934':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ie88b05c3997045bed66fc72b115f6f7e48b5d970
2016-06-02 21:07:51 +00:00
Chong Zhang
2f2af39911 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: Idb326fa8e459aaf3a97d841c91b3ccefc48dad81
2016-06-02 21:06:00 +00:00
Chong Zhang
33508a49e8 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev
am: b1e24209f1

* commit 'b1e24209f16621fd095dacb615364bfd15dfe721':
  Fix scroll amount calculation in ViewRootImpl

Change-Id: I538add512f7899ced2e0f940b16c8c34df5a9681
2016-06-02 21:05:58 +00:00
Chong Zhang
b1e24209f1 Merge "Fix scroll amount calculation in ViewRootImpl" into nyc-dev 2016-06-02 20:58:06 +00:00
Chris Tate
4169184518 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev am: 453951d077
am: 4872e3df96

* commit '4872e3df962a386576b51e03a26add0ceb700698':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Idabd2988d6b63e06a018c24c1b3a9e17514596b3
2016-06-02 20:55:53 +00:00
Christopher Tate
0cd6ca14eb Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia950b6992e76d05bccd5773cdda04308ddb054c0
2016-06-02 20:55:28 +00:00
Christopher Tate
4872e3df96 Merge "Don\'t back up/restore the "automatically restore app data" setting" into nyc-dev
am: 453951d077

* commit '453951d0777b1421e95bbcac501fb8b091c0f6a3':
  Don't back up/restore the "automatically restore app data" setting

Change-Id: Ia04215f6597dc3221bda438feb4921d53c1725fc
2016-06-02 20:49:27 +00:00
Chris Tate
453951d077 Merge "Don't back up/restore the "automatically restore app data" setting" into nyc-dev 2016-06-02 20:45:16 +00:00
Chong Zhang
6725472329 Fix scroll amount calculation in ViewRootImpl
When calculating scroll amount, we should check whehter focus
is visible using before-scrolling position.

It's possible that the view is already scrolled, then visible
insets changes (eg. IME went away). Previous scroll position
still makes the focus visible, but it will leave the focus
in a bad position when it should be scrolled back.

bug: 29025892
Change-Id: I091f16bebc4c1e5ba831616c51ab2ac75d4c4b3c
2016-06-02 13:33:40 -07:00
Roozbeh Pournader
36cd87d04e Unhide CharSequence APIs to BidiFormatter
The APIs are useful in avoiding the unnecessary creation of strings
when you have a CharSequence that's not a String.

Bug: 26979409
Change-Id: I27cd157ca53edb5f44a1e69085a1882af3cc7c6a
2016-06-02 13:01:19 -07:00
Roozbeh Pournader
61b54967e5 Merge "Use bidi heuristics correctly in BoringLayout#isBoring()" 2016-06-02 18:19:42 +00:00
Chris Wren
3a716c735b resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev am: d958f83a01
am: be2da62d11

* commit 'be2da62d11227c564817906c5df0ceb151ed2436':
  make the notification enqueue rate threshold a setting

Change-Id: I499087166d900cfbd4675e54382117c530e0e3ed
2016-06-02 16:48:13 +00:00
Chris Wren
be2da62d11 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
am: d958f83a01

* commit 'd958f83a017dde230203d91c8daedf36d40c22a6':
  make the notification enqueue rate threshold a setting

Change-Id: I5172c1a0f0832f3b93d05f0ab7b7b1ab7233d334
2016-06-02 16:41:30 +00:00
Chris Wren
d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04:00
Chris Wren
35f49c5968 Merge "make the notification enqueue rate threshold a setting" into nyc-dev
am: 43c3a7e5a7

* commit '43c3a7e5a781640b862cf6f51805b3823f46fd02':
  make the notification enqueue rate threshold a setting

Change-Id: I3e8c37aead7e1f2d5dc9fc89b72f82294bd16cfe
2016-06-02 15:13:43 +00:00
TreeHugger Robot
43c3a7e5a7 Merge "make the notification enqueue rate threshold a setting" into nyc-dev 2016-06-02 15:08:03 +00:00
Chris Wren
763a9bb095 make the notification enqueue rate threshold a setting
Bug: 28693065
Change-Id: I08bd2ed342d5347c0075183b239558c50ada4a0a
2016-06-02 15:07:20 +00:00
Calin Juravle
e73843941d Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp
am: 1d28af445b

* commit '1d28af445b716520b972827a61ed4ccf19aeb087':
  Don't create or check permissions on profiles during app startup

Change-Id: Icf5cb939565f2aae88f51c9cb55ff13a02351d65
2016-06-02 11:21:02 +00:00
Mudumba Ananth
be69ff0aa8 HFP 1.7 profile update (3/4) am: 0d98ebf997
am: 4bf18e1663

* commit '4bf18e1663a44045176ab2b55f66246482a7505a':
  HFP 1.7 profile update (3/4)

Change-Id: I9bff61dd2c8c68c76160ec19960ab07696844f84
2016-06-02 10:52:32 +00:00
Android Build Merger (Role)
1d28af445b Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037 am: dd2fc463f1" into nyc-mr1-dev-plus-aosp 2016-06-02 10:46:32 +00:00
Calin Juravle
afb21eee20 Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037
am: dd2fc463f1

* commit 'dd2fc463f1f0a92f613930f372c58af10e58e64c':
  Don't create or check permissions on profiles during app startup

Change-Id: I00890adeda97295c0d5630efd7e497d7f0ece8b8
2016-06-02 10:36:40 +00:00
Mudumba Ananth
4bf18e1663 HFP 1.7 profile update (3/4)
am: 0d98ebf997

* commit '0d98ebf997b24e96d0328b4195a22832f9ae2664':
  HFP 1.7 profile update (3/4)

Change-Id: I1594696d1d341026b7bd7f0a65c5cdac7049492e
2016-06-02 10:33:44 +00:00
Android Build Merger (Role)
2fd085bb4f Merge "Merge "Don\'t create or check permissions on profiles during app startup" into nyc-dev am: e67a29a037" into nyc-mr1-dev 2016-06-02 10:28:56 +00:00
Mudumba Ananth
0d98ebf997 HFP 1.7 profile update (3/4)
-> Android Framework changes to add support for
   an API to send indicator change in AG.
-> Added a system intent for broadcasting assigned number(ID)
   of the supported HF indicators and their values (if received)

Bug: 19983867
Change-Id: If26a7ae5da5686da72ebca9ec3decfe086e2ffb6
2016-06-02 10:21:55 +00:00