drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
198,181 Commits 1 Branch 0 Tags
Commit Graph

27607 Commits

Author SHA1 Message Date
Dianne Hackborn
35534fb480 am fb03aa36: am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit 'fb03aa36a4790ca0ff5e11a56903507089278390':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:33:34 +00:00
Dianne Hackborn
fb03aa36a4 am 5c269121: Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 
* commit '5c269121d8ea0bf3f530f2314695e189ffdb3165':
  Work on issue #22556778: Starting under voice control not allowed
 2015-07-17 22:17:58 +00:00
Dianne Hackborn
5c269121d8 Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev 2015-07-17 22:03:46 +00:00
Svet Ganov
d28adb4829 am 2d92575a: am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit '2d92575ad0dbbf3bfee4f013f4b78fac06c0ab50':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:22:39 +00:00
Svet Ganov
2d92575ad0 am 5ff4383b: Merge "Grant default permissions to default apps despite user choices." into mnc-dev 
* commit '5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5':
  Grant default permissions to default apps despite user choices.
 2015-07-17 21:10:16 +00:00
Svet Ganov
5ff4383b46 Merge "Grant default permissions to default apps despite user choices." into mnc-dev 2015-07-17 20:58:13 +00:00
Svet Ganov
ae61307d00 am fa9a616d: am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit 'fa9a616de9664c4bd7212683facbd31dcd9c3bdd':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 20:46:01 +00:00
Svet Ganov
4bb5187e63 Grant default permissions to default apps despite user choices. 
This implements the policy of granting default permissions to default
apps upon a selection despite past user permission choices. The act of
picking the app as the default one means the user expects it to work in
this capacity as SMS app, Phone app, Browser app.

bug:22062549

Change-Id: I5e427f2b939e85bb8bbfd311cc271b96857a7ce6
 2015-07-17 13:43:34 -07:00
Svet Ganov
fa9a616de9 am 4a1421f3: Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 
* commit '4a1421f3c50d53a7e2230f41854df12215378ef2':
  Do not auto grant GET_ACCOUNTS as it is temporarily normal
 2015-07-17 20:32:28 +00:00
Svet Ganov
4a1421f3c5 Merge "Do not auto grant GET_ACCOUNTS as it is temporarily normal" into mnc-dev 2015-07-17 20:27:36 +00:00
Svet Ganov
33852d8cd2 Do not auto grant GET_ACCOUNTS as it is temporarily normal 
bug:22550851

Change-Id: Iea5dd8fde07074220167a937b32208b1c9488d9d
 2015-07-17 13:21:36 -07:00
Wale Ogunwale
6b098bfee8 am 25257ca5: am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit '25257ca52e57b982ba71be040a7f261c66d37236':
  Fixed bad merge conflict resolution
 2015-07-17 19:11:06 +00:00
Wale Ogunwale
25257ca52e am af814340: Merge "Fixed bad merge conflict resolution" into mnc-dev 
* commit 'af81434023d19cfd486c84c210f2b6540a2bab35':
  Fixed bad merge conflict resolution
 2015-07-17 18:54:16 +00:00
Wale Ogunwale
af81434023 Merge "Fixed bad merge conflict resolution" into mnc-dev 2015-07-17 18:44:58 +00:00
Dianne Hackborn
f38c4ee903 Work on issue #22556778: Starting under voice control not allowed 
The ResolverActivity is voice capable.  In fact, it is capable
of EVERYTHING.

Change-Id: I37c4476d546f61fee3540b747aff77e88b702d48
 2015-07-17 11:21:26 -07:00
Todd Kennedy
b1f78ba8b5 am 8c47b335: am 5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev 
* commit '8c47b335b0dd06efbcbf17e26df2be67a33a15f1':
  clear calling identity to dexopt
 2015-07-17 15:02:52 +00:00
Todd Kennedy
8c47b335b0 am 5fe22e4f: Merge "clear calling identity to dexopt" into mnc-dev 
* commit '5fe22e4fcbc543aa588d739b2453b3fa72d31859':
  clear calling identity to dexopt
 2015-07-17 14:49:34 +00:00
Todd Kennedy
5fe22e4fcb Merge "clear calling identity to dexopt" into mnc-dev 2015-07-17 14:40:00 +00:00
Wale Ogunwale
24b243d53d Fixed bad merge conflict resolution 
https://android-review.googlesource.com/#/c/137534/ was accepted
and merged on 03/04/15. However, a bad merge conflict resolution
caused half of the change to be reverted. This adds back the missing
change.

Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea
 2015-07-17 07:20:57 -07:00
Adrian Roos
ec7ba2a7a2 am 6893aeee: am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 
* commit '6893aeee48adc1f8b8aebde5e21b7e1294acfaf2':
  Fix stuck scrim on keyguard-less devices
 2015-07-17 01:11:37 +00:00
Adrian Roos
6893aeee48 am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 
* commit '5536bb48b2829f04f9a8258bfe698e5e4a26f234':
  Fix stuck scrim on keyguard-less devices
 2015-07-17 00:56:20 +00:00
Adrian Roos
5536bb48b2 Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev 2015-07-17 00:43:18 +00:00
Todd Kennedy
2a89545739 clear calling identity to dexopt 
Bug: 22067670
Change-Id: I3596f26a079660f6898401ed679463193b00c799
 2015-07-16 16:39:46 -07:00
Svet Ganov
b295963bae am c00e49b6: am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'c00e49b6e4e4cc8356529567040d6ee3be8c1dc3':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:38:13 +00:00
Svet Ganov
c00e49b6e4 am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 
* commit 'd4b566bf56333de708908ce4accb5fb067be64f0':
  Add APIs for verifier to grant at install and revoke permissions
 2015-07-16 22:23:38 +00:00
Svet Ganov
d4b566bf56 Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev 2015-07-16 22:22:01 +00:00
Dianne Hackborn
61f0aec4f3 am 9236af43: am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit '9236af43d8418459b939049d4e7a092d2b58bff8':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 22:11:51 +00:00
Filip Gruszczynski
ebb56d9b0c am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev 
* commit '550f1d4eb3c9b0131106490841a6a369df639133':
  Delete overscan setting by both unique id and name.
 2015-07-16 22:02:48 +00:00
Dianne Hackborn
9236af43d8 am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 
* commit 'aaee5b5334746cabd59aed69153d08ecbb70ab1d':
  Work on issue #22516282: ChooserTarget URI grants not forwarded
 2015-07-16 21:51:49 +00:00
Dianne Hackborn
aaee5b5334 Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev 2015-07-16 21:44:21 +00:00
Makoto Onuki
d737ab1776 am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 
* commit 'b09b84cafde5ac31f5ef5c79f7a78db540824471':
  DefaultPermission: GET_ACCOUNTS is now in CONTACTS
 2015-07-16 21:19:33 +00:00
Makoto Onuki
b09b84cafd Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev 2015-07-16 21:01:39 +00:00
Makoto Onuki
bc92479a29 DefaultPermission: GET_ACCOUNTS is now in CONTACTS 
Bug 22532312

Change-Id: If7ad0faa3a196bb28da1ddc13788c0430df1d1ee
 2015-07-16 11:38:00 -07:00
Todd Kennedy
c84bf8498e am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev 
* commit 'a4911ed97102b638a373adcdae7e4c9b3c64cc30':
  Verfiy global apps with device owner
 2015-07-16 18:09:51 +00:00
Todd Kennedy
a4911ed971 Merge "Verfiy global apps with device owner" into mnc-dev 2015-07-16 17:59:35 +00:00
Dianne Hackborn
a7cfbe0e54 Work on issue #22516282: ChooserTarget URI grants not forwarded 
Add new option to startActivityAsCaller() which allows you to
specify that we should not do security checks on the target
activity being launched.

Change-Id: Ie6b28807b96fef35ccdff93b0a01066cfd8fa307
 2015-07-16 10:52:52 -07:00
Wale Ogunwale
fd2a5f1485 am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 
* commit '1181323230478e3027bbabbbaf769dcd4a11a0e4':
  Animate app exit for cases where the app is already hidden before transition
 2015-07-16 17:16:10 +00:00
Wale Ogunwale
1181323230 Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev 2015-07-16 17:01:15 +00:00
Wale Ogunwale
b60c0f616c Animate app exit for cases where the app is already hidden before transition 
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.

Bug: 22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
 2015-07-16 09:45:35 -07:00
Todd Kennedy
633f199831 Verfiy global apps with device owner 
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.

Bug: 21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
 2015-07-16 09:44:31 -07:00
Nicolas Prevot
b298ba4827 am dbdf7c45: Don\'t send app links to the parent if status = never (part 2) 
* commit 'dbdf7c45380f7701e029a279932d2c97bf55fdc9':
  Don't send app links to the parent if status = never (part 2)
 2015-07-16 11:12:30 +00:00
Nicolas Prevot
dbdf7c4538 Don't send app links to the parent if status = never (part 2) 
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.

BUG:22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
 2015-07-16 10:13:00 +01:00
Vineeta Srivastava
1099ad41e3 am 47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev 
* commit '47e0409062a2ac5a480fc1a57e443b75ce0f1dab':
  Remove redundant cancel events from FingerprintService
 2015-07-16 07:16:34 +00:00
Vineeta Srivastava
47e0409062 Merge "Remove redundant cancel events from FingerprintService" into mnc-dev 2015-07-16 07:06:54 +00:00
Svet Ganov
7121e18595 Add APIs for verifier to grant at install and revoke permissions 
bug:22231699

Change-Id: Ie0c758bf73699f50bf99ff5aa0bf98dcc9004e37
 2015-07-15 22:22:59 -07:00
Jim Miller
80a776e5fe Remove redundant cancel events from FingerprintService 
This fixes a bug where the framework was sending repeat cancel
events in response to terminal status (onAuthenticated(), onError())
which causes the underlying HAL implementation to get into a weird state.

Now, only client-initiated events like an explicit cancellation
or starting another authentication/enrollment invokes fingerprintd's
cancel() method.

Fixes bug 22438498

Change-Id: I762bab1c8635924848f9f4334db47a07130d5ae3
 2015-07-15 18:57:14 -07:00
Chris Tate
5a6267226e am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 
* commit 'a36c5580c503da98c137c5bf9f52a719a131d2a9':
  Fix a bug disappearing installerPackageName info of packages after reboot.
 2015-07-16 01:28:59 +00:00
Chris Tate
a36c5580c5 Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev 2015-07-16 01:18:06 +00:00
Christopher Tate
fbb4e9d23f am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev 
* commit '3b1f8607fdc416a87e608499698719f3234ecc90':
  Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
 2015-07-16 00:31:18 +00:00
Billy Lau
da93454bfa am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev 
* commit '008409a2ea1feed095d53ce51429e4fed964c50c':
  Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW...
 2015-07-16 00:21:44 +00:00