Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
205,454 Commits 3 Branches 0 Tags
ee94484303ebddbb5eb7cc7efa347240ad641bc7
Commit Graph

6192 Commits

Author SHA1 Message Date
Dianne Hackborn
1699ba48ce am 88936b7f: am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit '88936b7f82a6ec4023078e62304425147da4b56e':
  Implement better handling of text in assist.
 2015-07-08 02:05:44 +00:00
Dianne Hackborn
88936b7f82 am a719be69: am 15e35270: am 5e449276: am f2474d33: Merge "Implement better handling of text in assist." into mnc-dev 
* commit 'a719be69b1e0c8c6723457a51673f5dab8f9f819':
  Implement better handling of text in assist.
 2015-07-08 01:39:53 +00:00
Dianne Hackborn
f2474d336a Merge "Implement better handling of text in assist." into mnc-dev 2015-07-07 23:51:06 +00:00
Dianne Hackborn
6f0fdc4167 Implement better handling of text in assist. 
TextView is now much smarter about the text it reports, limiting it
to what is visible (plus a bit more).  Also add a facility for it to
report where the lines of text are, both as offsets in the text string
and their baselines on screen.

Part of fixing issue #22328792: Fix scalability issues in AssistStructure

Change-Id: Idddb8c3a3331355f381e2d4af06d520fe7c7ce8e
 2015-07-07 16:47:37 -07:00
Zoltan Szatmary-Ban
daed4c4c3e am 91a92009: am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '91a920099f871125bab78f7843bedf6984c2a71b':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 19:08:38 +00:00
Zoltan Szatmary-Ban
91a920099f am 6ad79259: am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 
* commit '6ad79259540e9e73c3d4664b03c103a560433db0':
  Update javadoc on DPM.setGlobalSetting
 2015-07-07 17:34:23 +00:00
Zoltan Szatmary-Ban
41df5bfc0d Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 2015-07-07 10:17:07 +00:00
Barnaby James
93e96d365f am fa75f27d: am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'fa75f27ddf8a0faf13ce152cb6efae0dd0ce9b16':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 19:32:06 +00:00
Barnaby James
fa75f27ddf am b908616f: am 413adbe2: am 2691d08c: am c1e3ac32: Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 
* commit 'b908616f8d48ea9de92020f89ec4bfeb6b89582e':
  Minor doc fixes for VoiceInteractor.
 2015-07-06 19:17:15 +00:00
Barnaby James
c1e3ac321f Merge "Minor doc fixes for VoiceInteractor." into mnc-dev 2015-07-06 17:08:15 +00:00
Svet Ganov
727513cf32 am 62bb3744: am c084fa0f: am 018733d6: am e8b8d30a: am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit '62bb374437fdb8941a08222d6a0cfb72da01ed38':
  Improve request permission docs
 2015-07-06 16:59:56 +00:00
Svet Ganov
62bb374437 am c084fa0f: am 018733d6: am e8b8d30a: am cb8d2e21: Merge "Improve request permission docs" into mnc-dev 
* commit 'c084fa0f1884ff58530e08ac493abed03748634e':
  Improve request permission docs
 2015-07-06 16:41:48 +00:00
Svet Ganov
e8ce8368fc am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
  Teach receivers, activities, providers, and services app ops.
 2015-07-04 07:28:18 +00:00
Svet Ganov
255aece7de Improve request permission docs 
bug:22252258

Change-Id: Ife19eb6b1e17b43a824379d2a039ff1c441bebdd
 2015-07-03 16:04:00 -07:00
Zoltan Szatmary-Ban
3c43095757 Update javadoc on DPM.setGlobalSetting 
Bug: 19967818
Change-Id: Id91c137f7b5200be8e8b581126a518f3b6be147e
 2015-07-03 14:04:09 +01:00
Svet Ganov
55cd6f44fd am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
  Teach receivers, activities, providers, and services app ops.
 2015-07-02 01:02:04 +00:00
Svet Ganov
99b6043dad Teach receivers, activities, providers, and services app ops. 
Perform app op check in addition to the permisison check for all four
paltform components - activities, content providers, broadcast receivers,
services - if they are guarded by a permssion that has an associated app
op. This ensures that legacy apps will behave correctly if the permission
of the caller has been revoked, i.e. the app op for that permission was
disabled.

bug:22199666

Change-Id: Ia22d1c38d58b3cd6aabdc655cb7c7bddd85da7a2
 2015-07-01 16:20:00 -07:00
Dianne Hackborn
507734074a am b6125220: am 78e67d73: am 80abf887: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit 'b6125220478a8cc9ae107d133b678fb7154b028b':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-01 01:20:39 +00:00
Dianne Hackborn
b612522047 am 78e67d73: am 80abf887: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev 
* commit '78e67d73e3d44831ac310cbf8e4e0f341440fcc5':
  Fix issue #22124996: VI: Command Request not Active
 2015-07-01 01:06:36 +00:00
Dianne Hackborn
593334ab70 Fix issue #22124996: VI: Command Request not Active 
Just forgot to add the request to the active set.

Also eradicate a bunch of old cruft that has been replaced
by the final APIs, and improve voice interaction test to
sit fully on top of the final APIs and have a test for
command request.

Change-Id: Ieff7a6165ebf2a4c5fb80c1ebd020511a2ae63ee
 2015-06-30 16:59:41 -07:00
Barnaby James
371a2385b4 Minor doc fixes for VoiceInteractor. 
Minor documentation fixes.
Make some @deprecated APIs @hidden.

Change-Id: I6bb3b6ab3a2518899098ac9f920386eeef12f635
 2015-06-30 15:22:49 -07:00
Svet Ganov
fc72ce8bbd am 49316d83: am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit '49316d83d518110c64fab92c423ebd263ee3b7cf':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:56:47 +00:00
Svet Ganov
49316d83d5 am ab4f6ff0: am 4a23ac45: Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 
* commit 'ab4f6ff013860e5fbb72542d9c47165a47244b0f':
  Installer is a part of the system with unrevocable permissions
 2015-06-30 19:44:27 +00:00
Svet Ganov
4a23ac4589 Merge "Installer is a part of the system with unrevocable permissions" into mnc-dev 2015-06-30 19:24:05 +00:00
Svet Ganov
3fc85e6f1a am fb498a31: am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev 
* commit 'fb498a311df525953900c0a186d3765e3a37ac56':
  Add read/write external storage app ops
 2015-06-30 17:37:04 +00:00
Svet Ganov
fb498a311d am c5c89955: am b24ff7e0: Merge "Add read/write external storage app ops" into mnc-dev 
* commit 'c5c8995510943527f99e51b04809dae090f0c2ab':
  Add read/write external storage app ops
 2015-06-30 17:23:30 +00:00
Svet Ganov
6a166af8fd Installer is a part of the system with unrevocable permissions 
1. Mark the installer permissions as not revocable.

2. Make the permission result dispatch more robust to handle installer death.

bug:22012614

Change-Id: Idee30ca884b87ccf97ba1bb878d4c49912e474b8
 2015-06-30 10:15:49 -07:00
Svet Ganov
b24ff7e03a Merge "Add read/write external storage app ops" into mnc-dev 2015-06-30 16:50:17 +00:00
George Mount
19accae7b3 am 7f8f9e5b: am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 
* commit '7f8f9e5b1372d44caf94186b4dfeaaa508a4b216':
  Fix FragmentTransaction replace() behavior
 2015-06-30 14:57:46 +00:00
George Mount
7f8f9e5b13 am aa315dbb: am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 
* commit 'aa315dbb361e447b6442efc562b41d9b6fedf4e4':
  Fix FragmentTransaction replace() behavior
 2015-06-30 14:45:46 +00:00
George Mount
0303d9ce70 Merge "Fix FragmentTransaction replace() behavior" into mnc-dev 2015-06-30 14:21:49 +00:00
Kenny Guy
679a5af472 am 2b3eccae: am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '2b3eccaec6eb43530d3a693ffe9310031e05e592':
  Deprecate APIs for admin to create users.
 2015-06-30 13:36:49 +00:00
Kenny Guy
2b3eccaec6 am d0418e8c: am 31659c25: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit 'd0418e8cf9a250183a2fc3d7474f82dc9e2da734':
  Deprecate APIs for admin to create users.
 2015-06-30 13:25:21 +00:00
Kenny Guy
31659c253e Merge "Deprecate APIs for admin to create users." into mnc-dev 2015-06-30 13:03:32 +00:00
Esteban Talavera
c4bb8de0d2 am 283b7ace: am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 
* commit '283b7ace805d9afd972cccf906a241c34761c7af':
  Marking some globals from setGlobalSetting as not supported
 2015-06-30 10:12:40 +00:00
Esteban Talavera
283b7ace80 am 37fd8bd1: am fef8cbd6: Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 
* commit '37fd8bd182c110b98772876f3fa47cc4d54042bc':
  Marking some globals from setGlobalSetting as not supported
 2015-06-30 09:56:10 +00:00
Esteban Talavera
fef8cbd6a6 Merge "Marking some globals from setGlobalSetting as not supported" into mnc-dev 2015-06-30 08:55:38 +00:00
Andreas Gampe
60b5cabb4c am 9958e75b: am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '9958e75b51029fca7bd130e37c5d5b3ca24e2788':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 06:12:40 +00:00
Andreas Gampe
9958e75b51 am 97378a62: am 6feb4301: Merge "Frameworks/base: Remove UsageEvents finalizer" into mnc-dev 
* commit '97378a628bc7edeb109af2bae32ec920970158bb':
  Frameworks/base: Remove UsageEvents finalizer
 2015-06-30 05:58:53 +00:00
Andreas Gampe
373fb40947 Frameworks/base: Remove UsageEvents finalizer 
The order of finalization between the parcel and the UsageEvents
objects is not defined. In the bad case, the parcel will be
finalized first and destroy its native pointer, after which the
UsageEvents object will recycle it, putting it back into one of
the Parcel pools. This will violate the pool invariant.

Bug: 22088355
Change-Id: Ifbe7822990cdfc31855d6742dcdea9d9dd0daf1b
 2015-06-29 22:07:30 -07:00
Svet Ganov
921c7dfc80 Add read/write external storage app ops 
bug:22104418

Change-Id: Ic9088f95bc02622c1163c1393e44382df6597707
 2015-06-29 21:51:45 -07:00
Eddie Ringle
22369d519d Fix FragmentTransaction replace() behavior 
Bug 22174959

According to FragmentTransaction's reference, replace()
should be equivalent to remove()'ing every fragment in
a given container and then adding the specified fragment
to replace those that were removed.

Commit ee76efb74b broke
this intended behavior in the framework.

This patch makes it so that the removal loop doesn't
end prematurely. It also fixes an issue where the
replace operation would remove fragments regardless
of their container after encountering the first fragment
with a matching container ID.

Relevant issues:
http://b.android.com/43265
http://b.android.com/52112
http://b.android.com/53393
http://b.android.com/68856
http://b.android.com/70803

Change-Id: Ica4691746ab8979ed974a998e85324e4feacc5e3
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
 2015-06-29 13:13:01 -07:00
Kenny Guy
516dfbe39f am 45dab52c: am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '45dab52ce84b4ecc6461260a28f1a8f72158be9f':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 17:26:01 +00:00
Craig Lafayette
6cdad1244d am 8a42356c: am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '8a42356c21435ee502efc925f70389a0c0024118':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 17:25:53 +00:00
Kenny Guy
0c5877f07b am 24863e12: am 2c594b21: am 01056b36: Merge "Deprecate APIs for admin to create users." into mnc-dev 
* commit '24863e12e51ecf3acb395f0036bbed8b27e23978':
  Deprecate APIs for admin to create users.
 2015-06-29 17:25:46 +00:00
Esteban Talavera
656fa7f5d1 Marking some globals from setGlobalSetting as not supported 
Those globals don't have the intended behaviour any more.

Bug: 19967818
Change-Id: I8c7891e59280f9deb88b1f0ffead3de07f4eca56
 2015-06-29 17:41:39 +01:00
Benjamin Franz
94a20a2efd resolved conflicts for merge of 31706d99 to master 
Change-Id: Ic3acad0d2d82ff8f0e5d31d3490c009d242d860b
 2015-06-29 17:39:31 +01:00
Kenny Guy
14f48e5a93 Deprecate APIs for admin to create users. 
Bug: 21921868
Change-Id: I0a59c85f6a87928de3df72278d4b65355ff7270f
 2015-06-29 15:11:25 +00:00
Kenny Guy
45dab52ce8 am 9aa0c481: am 43904fd5: Merge "Revert "Deprecate APIs for admin to create users."" into mnc-dev 
* commit '9aa0c4811097e7754cde0340dfcc32044a7caf7d':
  Revert "Deprecate APIs for admin to create users."
 2015-06-29 13:58:13 +00:00
Craig Lafayette
8a42356c21 am 5c708248: am bee7245c: Merge "Hide MIME_TYPE_PROVISIONING_NFC_V2" into mnc-dev 
* commit '5c708248c32f1a667ea3d49cf6ace28b5d29afd1':
  Hide MIME_TYPE_PROVISIONING_NFC_V2
 2015-06-29 13:57:56 +00:00