Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
271,361 Commits 3 Branches 0 Tags
50008f0c64dfaae25dd3859d134bad1a03635f4f
Commit Graph

6660 Commits

Author SHA1 Message Date
Yohei Yukawa
a3fd8bfdfe Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp 
am: c58ffb3f9c

Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
 2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev 
am: cb56978912

Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
 2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00
Ricky Wai
604582b6a3 Hide superfluous \\'Android system\\' header in Quite mode dialog am: 7f1ca4fe67 
am: 1481cd53bf

Change-Id: Ic62f9dcf3d36865c9f584e34231c8bdb6b3801b3
 2016-06-27 14:31:19 +00:00
Ricky Wai
1481cd53bf Hide superfluous \'Android system\' header in Quite mode dialog 
am: 7f1ca4fe67

Change-Id: If290b51864e27f08a604b6cae103450305e90299
 2016-06-27 14:27:17 +00:00
Ricky Wai
7f1ca4fe67 Hide superfluous 'Android system' header in Quite mode dialog 
Bug: 28390642
Change-Id: Ief678e35a0d9e4a37f4499c307ceb928e179cac8
 2016-06-27 14:05:01 +00:00
Dan Sandler
6ebc3e5c15 Cats are not, technically, tasty treats. am: 27a9fcc618 am: fadfc8e5e5 
am: b6d9598690

Change-Id: I47523b80a8d2502012dea265fe09855db4c1bc35
 2016-06-26 23:07:23 +00:00
Dan Sandler
b6d9598690 Cats are not, technically, tasty treats. am: 27a9fcc618 
am: fadfc8e5e5

Change-Id: Id974d6c8f76e4f94f2ad1c88383f4a43060fe859
 2016-06-26 23:03:39 +00:00
Dan Sandler
fadfc8e5e5 Cats are not, technically, tasty treats. 
am: 27a9fcc618

Change-Id: I04dd4cf9573e88635e814d75162b742fe19b316d
 2016-06-26 22:56:01 +00:00
Dan Sandler
1b2ed4394c Cats are not, technically, tasty treats. 
am: 27a9fcc618

Change-Id: I6ffdf66c9ef70052b7ba5ac5d926b32eae633fde
 2016-06-26 22:55:59 +00:00
Dan Sandler
27a9fcc618 Cats are not, technically, tasty treats. 
Bug: 27376882
Change-Id: I97183339e51c5d07fe6e9404bbcc5178ca605c05
Copilot: Jason Monk <jmonk@google.com>
 2016-06-26 15:00:11 +00:00
Evan Rosky
854036d55b Merge "Add option to disable lockscreen by default" 2016-06-24 21:36:39 +00:00
Yohei Yukawa
45700fa135 Use a flag to grant a temporary URI permission. 
It turns out that we can let the system to call
InputMethodService#exposeContent(InputContentInfo, EditorInfo), which
added in my previous CL [1], during the IME is calling
InputConnection#commitContent() as follows.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  getCurrentInputConnection().commitContent(
          inputContentInfo,
          InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION,
          null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

This gives us flexibility to let InputConnection#commitContent() do all
the magic for IME developers like other APIs such as
Context#startActivity(), rather than asking them to call one more API to
grant a temporary URI permission like a scenario where
Context#grantUriPermission() is used.

 [1]: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
      25e0813e6e

Bug: 29450031
Change-Id: I99536cd58c9984af30b0bafb4a1dd25a26634a2d
 2016-06-23 17:12:59 -07:00
Roozbeh Pournader
345f70e949 Merge \"Revert \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\"\" into nyc-mr1-dev 
am: 60882f517d

Change-Id: Ic0efed4a1c500fe021ee4244708bcda99f91f68e
 2016-06-23 22:09:03 +00:00
Roozbeh Pournader
60882f517d Merge "Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""" into nyc-mr1-dev 2016-06-23 21:58:57 +00:00
Roozbeh Pournader
51a760a0f2 Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"" 
This reverts commit ad48dc18a5. sr-Latn is no
longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I1922ef649aab36be6ba3b94e3fd79a71a14acdff
 2016-06-23 20:01:01 +00:00
Jeff Sharkey
c2c0442c23 Merge \\\"When uninstalling, only kill the requested user.\\\" into nyc-dev am: 060d5a0e0a am: 803a316d6e 
am: bcc1353019

Change-Id: I2c413747bafc9c1c0ed690b33e3f1fde48377eea
 2016-06-23 18:50:50 +00:00
John Reck
bcc1353019 Merge \\"Remove FD from the right Looper\\" into nyc-dev am: db13dd41a9 
am: c86a2e325e

Change-Id: I85ed478cf265fbc1857b08b89f32fb2aa358e284
 2016-06-23 18:45:16 +00:00
John Reck
50e952fe74 Merge \"Remove FD from the right Looper\" into nyc-dev 
am: db13dd41a9

Change-Id: I590fa2c47bcc90ee5b269fde5cdac9557206ed88
 2016-06-23 18:44:16 +00:00
John Reck
c86a2e325e Merge \"Remove FD from the right Looper\" into nyc-dev 
am: db13dd41a9

Change-Id: I451ef3649426d9b8ea1bf15e388d0efa82dae442
 2016-06-23 18:39:44 +00:00
John Reck
ac04f4e69a Remove FD from the right Looper 
Bug: 29586513

Also gives BackdropFrameRenderer a direct-destroy
of Choreographer since it's hammering on new Threads
and we don't want to wait for the GC to release
FDs.

Change-Id: Id2ec0af2ee4d5304961c4ab87a104ccb92f35fc2
 2016-06-23 11:00:00 -07:00
Yohei Yukawa
bf055ba658 Merge \\"Add InputMethodService#exposeContent()\\" into nyc-mr1-dev am: dc42d7dd13 
am: d02470f5a8

Change-Id: Id551d53ae3d7c34157ddf166aa44bdef67d46853
 2016-06-23 01:37:10 +00:00
Yohei Yukawa
d02470f5a8 Merge \"Add InputMethodService#exposeContent()\" into nyc-mr1-dev 
am: dc42d7dd13

Change-Id: Icf3ca0403c7dee26a3083ca98ca1239887d471bc
 2016-06-23 01:29:58 +00:00
Yohei Yukawa
dc42d7dd13 Merge "Add InputMethodService#exposeContent()" into nyc-mr1-dev 2016-06-23 01:25:39 +00:00
Jim Miller
f0db3158fb Merge \\"Enable fingerprint sensor navigation to invoke QuickSettings - rename \\"FP_NAV\\" to more generic \\"SYSTEM_NAVIGATION\\"\\" into nyc-mr1-dev am: 0520091641 
am: 0a7efa1e47

Change-Id: Id8de76d28e581f5a4fa448dd48dc33870d81b538
 2016-06-23 00:25:06 +00:00
Jim Miller
0a7efa1e47 Merge \"Enable fingerprint sensor navigation to invoke QuickSettings - rename \"FP_NAV\" to more generic \"SYSTEM_NAVIGATION\"\" into nyc-mr1-dev 
am: 0520091641

Change-Id: I285f751bd449c89685a88ad30073cd011dfe5061
 2016-06-23 00:20:57 +00:00
Evan Rosky
2eff745087 Add option to disable lockscreen by default 
Bug: 27502832
Change-Id: I3e5d024c07a69f3fea1c0450040898c53b732183
 2016-06-22 23:49:15 +00:00
Yohei Yukawa
25e0813e6e Add InputMethodService#exposeContent() 
This is a follow up CL to my previous CLs [1][2] that introduced
InputConnection#commitContent(InputContentInfo, Bundle) API to enable
IMEs to send a content to the target application.

With this CL, IME developers are able to temporarily expose
InputContentInfo object to the target package without permanently
granting URI permission.  Although calling IMS#exposeContent() is
allowed only for the IME that is currently selected, the client is able
to request a temporary read-only access even after the current IME is
switched to any other IME as long as the client keeps InputContentInfo
object.

Here is a sample code snippet about how to use this mechanism.

  [IME]
  InputContentInfo contentInfo = new InputContentInfo(
          contentUri,
          new ClipDescription(description, new String[]{mimeType}),
          linkUrl);
  exposeContent(contentInfo, getCurrentInputEditorInfo());
  getCurrentInputConnection().commitContent(inputContentInfo, null);

  [App]
  try {
      contentInfo.requestPermission();
      // Load inputContentInfo.getContentUri() here.
  } finally {
      contentInfo.releasePermission();
  }

 [1]: Iaadf934a997ffcd6000a516cc3c1873db56e60ad
      152944f490
 [2]: Ica1ba3154795c1bf44e140dfe639b299f83cd8af
      adebb52588

Bug: 29450031
Change-Id: I2772889ca01f2ecb2cdeed4e04a9319bdf7bc5a6
 2016-06-22 16:31:41 -07:00
Jim Miller
07e0384a4e Enable fingerprint sensor navigation to invoke QuickSettings 
- rename "FP_NAV" to more generic "SYSTEM_NAVIGATION"

Fixes bug 28869612

Change-Id: I321240ee54506633d63a29e987b8d8638c652391
 2016-06-22 15:18:13 -07:00
Adam Lesinski
122cbd1705 Merge \\\"Prevent early boot crash reading PowerProfile\\\" into nyc-dev am: ec6db57ac7 am: 31ef27c249 
am: 965ed1170b

Change-Id: I076e5933a1cd3f93fedd044c835b790e0ad11818
 2016-06-22 17:47:02 +00:00
Adam Lesinski
965ed1170b Merge \\"Prevent early boot crash reading PowerProfile\\" into nyc-dev am: ec6db57ac7 
am: 31ef27c249

Change-Id: I370e3d0caacae88865ad26d0ef6049ba2abd774c
 2016-06-22 17:41:15 +00:00
Adam Lesinski
31ef27c249 Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev 
am: ec6db57ac7

Change-Id: I6366fcaa2b1a85b271d74df321100d590fd258a1
 2016-06-22 17:37:41 +00:00
Adam Lesinski
21ce707021 Merge \"Prevent early boot crash reading PowerProfile\" into nyc-dev 
am: ec6db57ac7

Change-Id: Id0327572c549eff30dfe0a8fd70007bcaccf7a32
 2016-06-22 17:37:41 +00:00
Adam Lesinski
ec6db57ac7 Merge "Prevent early boot crash reading PowerProfile" into nyc-dev 2016-06-22 17:31:35 +00:00
Adam Lesinski
1a76a62b8d Prevent early boot crash reading PowerProfile 
The PowerProfile in BatteryStatsImpl may not be ready when
resetting stats early in the boot sequence.

Bug:29559031
Change-Id: I51bba762231a08804f1b68505bb1b0523476081d
 2016-06-22 10:28:47 -07:00
Roozbeh Pournader
2704d4ead1 Merge \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\" into nyc-mr1-dev 
am: 55d9051e58

Change-Id: I91e077b159c8830af38d608855b5cc6310e7f2d6
 2016-06-20 22:33:29 +00:00
Roozbeh Pournader
ad48dc18a5 Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" 
This reverts commit e977b0ae59 for MR1.
The original commit is only intended for N, not MR1.
 2016-06-20 14:59:29 -07:00
Roozbeh Pournader
a1de63c871 Merge \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\" into nyc-dev am: 160126e2d8 
am: 73939d8a60

Change-Id: Ib8af2e151d29b17a8492fe00cd0b1b5e412ca5f5
 2016-06-20 21:51:12 +00:00
Roozbeh Pournader
1f2f328025 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev 
am: 160126e2d8

Change-Id: I0897fc904264955dddf459c893bd774fb1ff74e1
 2016-06-20 21:44:50 +00:00
Roozbeh Pournader
73939d8a60 Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev 
am: 160126e2d8

Change-Id: I9e26a77ba4e186a9e3fd59b9618b3eb36127178f
 2016-06-20 21:44:42 +00:00
Roozbeh Pournader
160126e2d8 Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev 2016-06-20 21:39:22 +00:00
Adam Lesinski
8549988a89 Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55f9 am: a804fae3be 
am: 0f7b0a8cc6

Change-Id: If2d120974fe4caaf6f204b191bca0b6989757f28
 2016-06-20 20:05:22 +00:00
Adam Lesinski
0f7b0a8cc6 Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9 
am: a804fae3be

Change-Id: I3caa53d3b065bfe67af7f0ca0878c5801d1b6967
 2016-06-20 20:00:07 +00:00
Adam Lesinski
145e50243e Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev 
am: c2e06a55f9

Change-Id: Ifb3d993b085040c17f136dd0f91433762d3d548f
 2016-06-20 19:55:37 +00:00
Adam Lesinski
a804fae3be Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev 
am: c2e06a55f9

Change-Id: I4f590635c720ddbb6dfac292753606b9d3fe16e0
 2016-06-20 19:55:37 +00:00
TreeHugger Robot
c2e06a55f9 Merge "BatteryStats: record best estimated battery capacity" into nyc-dev 2016-06-20 19:49:46 +00:00
Adam Lesinski
f9b20a9ec4 BatteryStats: record best estimated battery capacity 
Using the coulomb counter, record the estimated max battery
capacity.

Bug:28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
 2016-06-20 10:58:37 -07:00
Christopher Ferris
9738e7d393 resolve merge conflicts of cf11123 to master 
Change-Id: I6d65685d415edea0be48bab04a71d4c52b1c66fe
 2016-06-17 18:12:01 -07:00
Roozbeh Pournader
e977b0ae59 Mark Serbian in Latin script as non-localized [DO NOT MERGE] 
Serbian in Latin script is only partially localized in Android N. We
should not show it as localized in either Setup Wizard or Settings.

Bug: 29460424
Change-Id: I6829a89c49c1b5e8768b1527daa3aa9508deb491
 2016-06-17 17:34:13 -07:00
Wei Wang
cf11123025 Merge \"remove Intent.FLAG_ACTIVITY_NEW_TASK flag check\" into nyc-mr1-dev 
am: 4828bb9330

Change-Id: I6d594545f43f5ca8e9a7b777a8f1b8b6b80e7fa6
 2016-06-18 00:29:44 +00:00