Commit Graph

58265 Commits

Author SHA1 Message Date
Tao Bao
1327a97a07 Add RecoverySystem.rebootWipeAb() system API.
It reboots into recovery and securely wipes an A/B device.

Bug: 27253717
Bug: 29159185
Change-Id: I8252894db5c1df48bc4a8728b7f0e0f18aebc44c
2016-06-09 16:57:54 -07:00
Phil Weaver
5c32d65e78 Merge \"Revert \"Improve accessibility window title behavior\"\" into nyc-dev
am: fc71309640

Change-Id: I7b0c0636a69e4cc06d525f60d8621879ce45be22
2016-06-08 02:24:42 +00:00
Phil Weaver
fc71309640 Merge "Revert "Improve accessibility window title behavior"" into nyc-dev 2016-06-08 02:19:34 +00:00
Android Build Merger (Role)
22eaf715a1 Merge "Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev am: 723e5afa9e" into nyc-mr1-dev 2016-06-08 01:23:04 +00:00
Chong Zhang
5c689127ba Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev
am: 723e5afa9e

Change-Id: Ib739a55588b270e76cdb11c5356fd90c19c644dc
2016-06-08 01:22:43 +00:00
TreeHugger Robot
ba3676460a Merge "Added a getPrimaryStorageSize() method." into nyc-mr1-dev 2016-06-08 01:22:18 +00:00
Felipe Leme
53c1637134 Merge \"Duplicate file descriptor when dumping asynchronously.\" into nyc-dev
am: c02ba17898

Change-Id: Ief488d02aac6900453e5344959aad8c417d60c8d
2016-06-08 01:15:06 +00:00
Chong Zhang
723e5afa9e Merge "Use getActivityToken() instead of mToken in isTopOfTask" into nyc-dev 2016-06-08 01:12:27 +00:00
TreeHugger Robot
c02ba17898 Merge "Duplicate file descriptor when dumping asynchronously." into nyc-dev 2016-06-08 01:08:42 +00:00
Siyamed Sinir
9eddf7ae8e Merge \"Fix int overflow in SpannableStringBuilder.replace\" into nyc-dev
am: 96c3e5504b

Change-Id: Ibac22676dcfcd8874bc2415f7fb4f76849896748
2016-06-08 00:50:14 +00:00
Siyamed Sinir
96c3e5504b Merge "Fix int overflow in SpannableStringBuilder.replace" into nyc-dev 2016-06-08 00:46:28 +00:00
Phil Weaver
266ed9acc3 Revert "Improve accessibility window title behavior"
Bug: 29127065

This reverts commit 2a7e4442bf.

Change-Id: Ibc5527cfedd49c685ffd1b8ae59e87ed99c93d39
2016-06-08 00:34:40 +00:00
Felipe Leme
18202e00bd Added a getPrimaryStorageSize() method.
BUG: 24128505

Change-Id: I0b75d3c5505dadedf5d06868614b3a01765cc5d3

** Cherrypicked from master **
2016-06-07 16:42:35 -07:00
Felipe Leme
29de4922db Duplicate file descriptor when dumping asynchronously.
dumpDbInfo() uses an async task when dumping from the system thread, but
then the file descriptor is closed by the time the task is executed. As
such, the system databases are not dumped.

BUG: 29123428
Change-Id: Ibb8bbe503aa03c3ca13b2b1789f0ead0b869e9d5
2016-06-07 16:35:50 -07:00
Esteban Talavera
cc12064670 Merge "Fix getApplicationRestrictions documentation" into nyc-dev
am: a86d6c4df3

* commit 'a86d6c4df3b193060b4b725e1abfed4f69689843':
  Fix getApplicationRestrictions documentation

Change-Id: Ia552cc886a182f558b7479b1d2a0201061dc5cc6
2016-06-07 17:59:01 +00:00
Esteban Talavera
953fe48329 Fix getApplicationRestrictions documentation
The method never returns null, only empty bundle

Bug: 29178626
Change-Id: Ic53154eafe94c6c501b59932441d7ae1c89cb689
2016-06-07 17:21:49 +01:00
TreeHugger Robot
fe3ecdab1b Merge "Revert "Internal API for cross-task Activity used by assistant."" into nyc-mr1-dev 2016-06-06 23:44:34 +00:00
Eino-Ville Talvala
563df3b328 Revert "Internal API for cross-task Activity used by assistant."
This reverts commit 04073dc5be.

Bug: 29128683
Change-Id: I7d9bb7bb388f38e8e5ab159a211ee7f9f4fb7ab9
2016-06-06 22:04:54 +00:00
Chen Xu
ba3428f01b Merge "cold sim clean up" into nyc-mr1-dev 2016-06-04 05:48:47 +00:00
Siyamed Sinir
eb4df8a822 Fix int overflow in SpannableStringBuilder.replace
During the offset calculation for selection, SpannableStringBuilder
had an overflow while multiplying two int values. This CL uses long to
calculate the multiplication, and also checks for overflow after
casting the final result into int again.

Bug: 29108549
Change-Id: I11eff4677916701074b38bc5214730fe704707c4
2016-06-03 18:11:45 -07:00
TreeHugger Robot
c27660d45a Merge "Add new attributes for wallpaper info" into nyc-mr1-dev 2016-06-04 00:22:06 +00:00
Jorim Jaggi
526505da25 Add new attributes for wallpaper info
Adjust test wallpaper to use these attributes.

Also fix some issues where wallpaper got laid out differently in the preview
mode.

Bug: 28770685
Change-Id: I259f3884f5f2c0b723a6a5ce012d45170f64c4c7
2016-06-03 15:50:31 -07:00
George Mount
3af59ef42c Merge "Internal API for cross-task Activity used by assistant." into nyc-mr1-dev 2016-06-03 22:22:53 +00:00
George Mount
04073dc5be Internal API for cross-task Activity used by assistant.
29091742

A new internal API has been created for use by assistant
to launch an Activity Transition from a non-Activity.

The ActivityOptions are also passed along when using
a spring board Activity so that the shared elements
can be properly synchronized.

This also fixes TransitionManager.endTransition so
that it forces Transitions to end the animations.

Change-Id: Id18d9765bfc0c7b438e17966455aa66d3fa3aeda
2016-06-03 14:08:06 -07:00
Chong Zhang
6f9ae4ffc5 Use getActivityToken() instead of mToken in isTopOfTask
mToken could be local tokan and causes IllegalArgumentException.

bug: 29072444
Change-Id: I0f889a70a848ffea31663ed80337e1605c75223e
2016-06-03 11:50:44 -07:00
fionaxu
1bf6ec2f86 cold sim clean up
- add a new field: provisioningNotificationEnabled from NetworkMisc. set
  to false if we want to hide "sign in" notification and placed
  carrier-specific notification instead. it is set on connect, once set,
  it is carrier-app's responsibility to post new UI to users
- rework on the interaction between carrier app and framework
- code cleanup
- unit test support

Bug: 28567303
Change-Id: Ic84db7ffbb920d15344717f104496d3cb82e1a85
2016-06-03 11:45:12 -07:00
Eino-Ville Talvala
02c43050af Merge "Camera2: Update lensShadingMap documentation" into nyc-dev
am: cd44a32dfe

* commit 'cd44a32dfe6a5a39db496af6de7764e164cda6f5':
  Camera2: Update lensShadingMap documentation

Change-Id: I8011b348ebc133ab6664db5948066ded857d5285
2016-06-03 18:01:57 +00:00
Eino-Ville Talvala
cd44a32dfe Merge "Camera2: Update lensShadingMap documentation" into nyc-dev 2016-06-03 17:51:19 +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
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
e8526a0105 Merge "Camera2: add deferred output config support" into nyc-mr1-dev 2016-06-03 01:14:00 +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
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
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
Eino-Ville Talvala
c62cea89ce Camera2: Update lensShadingMap documentation
Revert added language about shading map being the full flat-field
correction; it's actually the same correction as applied to camera
device-processed data.

Also fix a few other wording issues in the lens shading documentation.

Bug: 18175853
Change-Id: I27691925e6496afe18f3506084d89f2523b5555d
2016-06-02 14:21:27 -07: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
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
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
Chris Wren
d958f83a01 resolve merge conflicts of 43c3a7e5 to nyc-mr1-dev
Change-Id: I85619e6d8176bf23b6f4090c4573e5d9c248b585
2016-06-02 12:15:35 -04: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
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