Commit Graph

6011 Commits

Author SHA1 Message Date
Robin Lee
d5c99db459 am 347836e9: am 8bbbcd3d: Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev
* commit '347836e965dd5c88b1a679d27e7a66f6858a7e3e':
  Policy: make bulk CA uninstalls happen in service
2015-06-10 23:15:04 +00:00
Jeff Brown
a748bfbd6e am 9749e335: am 4bc50540: Merge "Support 4K overlay displays." into mnc-dev
* commit '9749e33579a3d27144ac39d9e3572ed30e234039':
  Support 4K overlay displays.
2015-06-10 23:14:36 +00:00
Robin Lee
8bbbcd3d54 Merge "Policy: make bulk CA uninstalls happen in service" into mnc-dev 2015-06-10 19:44:18 +00:00
Robin Lee
83881bdbde Policy: make bulk CA uninstalls happen in service
Fewer round trips, only one point of contact for bugs to creep in.

Bug: 21650477
Change-Id: I1764faa753bd674ecb0d13149d778d99bd2ff4c4
2015-06-10 19:40:44 +00:00
Jeff Brown
fe4ad335d8 Support 4K overlay displays.
Bug: 18241736
Change-Id: Ibd479f2ea47ed49a507e7265bdce83afc214b19c
2015-06-09 19:52:23 -07:00
Svetoslav
54dd1e4c73 am 60022334: am a1e60f1f: Merge "Use who when requesting permissions" into mnc-dev
* commit '60022334b7bff4a8c985465186e7472215178819':
  Use who when requesting permissions
2015-06-10 01:54:27 +00:00
Dianne Hackborn
3fca7b7929 am 4f8fdd93: am 113769d7: Merge "Fix NPE." into mnc-dev
* commit '4f8fdd93329e5f78a21e6eeee75f99a6c9399743':
  Fix NPE.
2015-06-10 01:29:22 +00:00
Svetoslav
a1e60f1f45 Merge "Use who when requesting permissions" into mnc-dev 2015-06-10 01:29:21 +00:00
Svetoslav
970b59cbe3 Use who when requesting permissions
Change-Id: Id0b231f8b74099b7877eb4441a1664416c641731
2015-06-09 18:17:44 -07:00
Dianne Hackborn
c0cdfa5947 Fix NPE.
Change-Id: Iea1faf4b3070ed29884e133e3bab54401bd77bcf
2015-06-09 17:53:47 -07:00
Dianne Hackborn
45c75dea7f am 549aacfe: am 47669522: Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev
* commit '549aacfe9a299a61b5bc5acc2b776ac545cd855b':
  Fix issue #21621920: VI: need mechanism to get current request
2015-06-10 00:00:11 +00:00
Dianne Hackborn
4766952273 Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev 2015-06-09 23:33:52 +00:00
Wale Ogunwale
a70c0d7aa1 am d43ee126: am 2c4643dd: Merge "Fixed issue with using wrong display id when creating context for displays" into mnc-dev
* commit 'd43ee1260e5cd9fb7cd56d38557b494bc475612f':
  Fixed issue with using wrong display id when creating context for displays
2015-06-09 23:27:44 +00:00
Wale Ogunwale
cac3dc636d Fixed issue with using wrong display id when creating context for displays
Bug: 21729214
Change-Id: I58b6712e2929e758c3fc3b2d493991ba0262dec9
2015-06-09 15:35:02 -07:00
Dianne Hackborn
51bcd6728b am 1a18d087: am ea7438e4: Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev
* commit '1a18d087d7c31ee037c9583949f5ecc34ae96479':
  Fix issue #21571700: Need to be smarter about how foreground...
2015-06-09 21:26:09 +00:00
Dianne Hackborn
a3acdb33df Fix issue #21621920: VI: need mechanism to get current request
Add new APIs to associate a Request with a name, get all active
requests, and get active request by name.

Also add a new Activity.onProvideReferrer() which will allow
applications to propagate referrer information to the assistant
(and other apps they launch) in a consistent way.

Change-Id: I4ef74b5ed07447da9303a74a1bdf42e4966df363
2015-06-09 14:15:49 -07:00
Dianne Hackborn
ea7438e4a6 Merge "Fix issue #21571700: Need to be smarter about how foreground..." into mnc-dev 2015-06-09 21:08:17 +00:00
Julia Reynolds
6be25283c8 am 6ca311ca: am 058652c2: Merge "Remove the ability to set a preferred setup activity." into mnc-dev
* commit '6ca311ca99bc1290d714c6918e57db6daef7a941':
  Remove the ability to set a preferred setup activity.
2015-06-09 17:12:27 +00:00
Julia Reynolds
cedd53adc3 Remove the ability to set a preferred setup activity.
Bug: 21557327
Change-Id: I8c1809d25c5f5fcd186dfc0636d8ac47ed5fc903
2015-06-09 12:34:27 -04:00
Guang Zhu
c04c50869c am a60e72ae: am 53b3bb07: Merge "clean up Process instance after we are done with the sub process" into mnc-dev
* commit 'a60e72ae2cc13e55d9c1af619437a6d18b8b7957':
  clean up Process instance after we are done with the sub process
2015-06-09 00:49:02 +00:00
Guang Zhu
53b3bb072b Merge "clean up Process instance after we are done with the sub process" into mnc-dev 2015-06-09 00:30:39 +00:00
Dianne Hackborn
ab4bb9d1fe Fix issue #21571700: Need to be smarter about how foreground...
...services get out of app idle

Introduce a new process state to even better distinguish foreground
services from other states.  Rework the INTERACTION reporting to
usage stats to do it less when the screen is off -- require that
an app sit in the foreground service or top activity state for
at least 30 minutes before we consider it an interaction.

Also eradicate a bunch of logging in package manager.

Change-Id: I94249e67f9a9c62e9a92ae104710e6747b16327e
2015-06-08 13:51:57 -07:00
Wale Ogunwale
152b03e852 am 549ac692: am d8b9b642: Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev
* commit '549ac6925a28bf185515334a99cffb2048f0708a':
  Use DisplayAdjustments when creating display in ResourceManager
2015-06-08 20:37:43 +00:00
Wale Ogunwale
d8b9b642fe Merge "Use DisplayAdjustments when creating display in ResourceManager" into mnc-dev 2015-06-08 20:17:23 +00:00
Dianne Hackborn
82aa5f2cf5 am 09653fc5: am 54d729b7: Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev
* commit '09653fc5ee5f2050f61e055d773d0f873c71b6db':
  Fix issue #21572679: API Review: ActivityOptions, usage time report
2015-06-08 20:02:02 +00:00
Mike Lockwood
e89f9d8af7 am ac4c704b: am 383ce580: Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev
* commit 'ac4c704b4ef233f12c649f6e20794dd1aeb28a1d':
  MidiManager: proxy all requests to open devices through MidiService
2015-06-08 20:01:57 +00:00
Dianne Hackborn
54d729b73f Merge "Fix issue #21572679: API Review: ActivityOptions, usage time report" into mnc-dev 2015-06-08 19:46:24 +00:00
Mike Lockwood
383ce580b1 Merge "MidiManager: proxy all requests to open devices through MidiService" into mnc-dev 2015-06-08 19:37:36 +00:00
Tim Kilbourn
6b3bb7d669 am 0a08108d: am 159f558a: Merge "Pass an args bundle to launchAssistAction." into mnc-dev
* commit '0a08108d753f2d04da046e6d7792ee33ac2af364':
  Pass an args bundle to launchAssistAction.
2015-06-08 17:14:02 +00:00
John Spurlock
202dea4125 am 5e73a085: am 20ac61b8: Merge "Zen: New user flow for requesting DND access." into mnc-dev
* commit '5e73a085c6788670d1e3bec423f346f60d88c977':
  Zen: New user flow for requesting DND access.
2015-06-08 17:06:13 +00:00
Mady Mellor
1612c73a8b am b4142e1c: am e1f3214e: Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev
* commit 'b4142e1c6044a5cb5224ae3f968cb3690d0fbbf7':
  Change stylus button press to context click in View - API review feedback
2015-06-08 17:05:52 +00:00
Tim Kilbourn
159f558a39 Merge "Pass an args bundle to launchAssistAction." into mnc-dev 2015-06-08 16:46:42 +00:00
John Spurlock
20ac61b8c0 Merge "Zen: New user flow for requesting DND access." into mnc-dev 2015-06-08 16:39:36 +00:00
John Spurlock
7c74f78a85 Zen: New user flow for requesting DND access.
- User flow is now similar to requesting access to notification
   content, namely prompting the user to visit a settings page
   for enabling/disabling apps access.
 - New ACTION_NOTIFICATION_POLICY_ACCESS_GRANTED_CHANGED intent
   for apps to listen to this state change.
 - Removed obsolete request method and associated internal callback
   aidl.
 - Added new android.permission.ACCESS_NOTIFICATION_POLICY permission
   for apps to include as a signal that they want to request this access
   (and therefore appear in the list on the settings page).
 - Improve javadocs, outline the user flow in NotificationManager#isNotificationPolicyAccessGranted
   and link to this method elsewhere.
 - NoManService now persists the user-enabled package list across reboots
   and does so per-user.
 - Rename public settings intent to correspond with the noman api.

Bug: 21621663
Change-Id: I72cbc21cd736e6a157b6be5d1d0ba0b4a8e7ef4e
2015-06-08 11:53:35 -04:00
Mady Mellor
e1f3214e72 Merge "Change stylus button press to context click in View - API review feedback" into mnc-dev 2015-06-08 15:11:32 +00:00
Guang Zhu
843b992b51 clean up Process instance after we are done with the sub process
Per java doc of java.lang.Process, #destroy() should be called
after the parent process is done with the sub process.

Bug: 20435160
Change-Id: I254982388c5b46c93c214b37a1e8563f21805e82
2015-06-07 16:16:15 -07:00
Wale Ogunwale
26698514fb Use DisplayAdjustments when creating display in ResourceManager
We were previous only taking the Configuration into account when
creating Display objects in the ResourceManager. This led to the
Display object not containing critical CompatibilityInfo. We now
take the entire DisplayAdjustment into account.

Bug: 21637615
Change-Id: Ide5ff49bfa12791ad17993764f312836216b1dd8
2015-06-06 11:26:33 -07:00
Adam Skory
faf041da26 am 3f6bf4b2: am e76e7014: Don\'t forget to parcel mIsAppProvidedIntent
* commit '3f6bf4b287052f3fface43dd0377bcfada087de6':
  Don't forget to parcel mIsAppProvidedIntent
2015-06-06 01:33:09 +00:00
Adam Skory
8e7f05c86e am e1015188: am a28863e7: Merge "Record provision of custom Intents in AssistContent" into mnc-dev
* commit 'e10151882a255a13fc6b02123db891cae7d65143':
  Record provision of custom Intents in AssistContent
2015-06-06 01:20:15 +00:00
Adam Skory
e76e7014c7 Don't forget to parcel mIsAppProvidedIntent
If you forget to parcel it like I did, it's
not going to do you much good.

Change-Id: I85191594e7ffab2c36aeed317932b126da288bdf
2015-06-05 19:08:01 -06:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
2015-06-05 18:55:29 -06:00
James Cook
80a250a3c8 am 715c502b: am 74f3d396: Merge "Allow different visual and voice assist prompts" into mnc-dev
* commit '715c502bedee1e414d9d420d35e91a8f2920f25a':
  Allow different visual and voice assist prompts
2015-06-06 00:18:47 +00:00
Stefan Kuhne
000324423f am a3590bff: am 5c6c06bf: Merge "Adding am send-trim-memory command" into mnc-dev
* commit 'a3590bffa11dabd0721b731f53e0a1ad84caeabc':
  Adding am send-trim-memory command
2015-06-06 00:00:06 +00:00
James Cook
74f3d39671 Merge "Allow different visual and voice assist prompts" into mnc-dev 2015-06-05 23:49:59 +00:00
Stefan Kuhne
5c6c06bf18 Merge "Adding am send-trim-memory command" into mnc-dev 2015-06-05 23:37:15 +00:00
James Cook
6cf397508e Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
2015-06-05 16:36:22 -07:00
Stefan Kuhne
16045c24fe Adding am send-trim-memory command
This patch adds a send-trim-memory command to the ActivityManager to allow
for better debugging&testing.

The command is
adb shell am send-trim-memory [--user <USER_ID>] <PROCESS> <LEVEL>
whereas LEVEL can be one of the following:
[HIDDEN|RUNNING_MODERATE|BACKGROUND|RUNNING_LOW|MODERATE|
 RUNNING_CRITICAL|COMPLETE]

Bug: 21633189
Change-Id: I7a41ce02c3c9043ffd3e5aaa791f7b7306a9de49
2015-06-05 16:30:29 -07:00
Tim Kilbourn
0e5f110fc9 Pass an args bundle to launchAssistAction.
In order to track the input device that was used to trigger assist, the
input device id is sent as an extra in the assist intent whenever it is
available. This is particularly useful on TVs, when an app may want to
know whether the input device has a microphone.

Bug: 21666123
Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
2015-06-05 23:26:39 +00:00
Dianne Hackborn
67ba2c7fa2 Fix issue #21572679: API Review: ActivityOptions, usage time report
Change-Id: I62751e93e39f90d5d2ec725586880724f3edbbc7
2015-06-05 14:23:38 -07:00