Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,332 Commits 3 Branches 0 Tags
94d5ade9ea645914e22bb356ddcaeb814bf02596
Commit Graph

5965 Commits

Author SHA1 Message Date
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
Zoltan Szatmary-Ban
0a5bfb463a am e1a985ea: am c92550e4: Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 
* commit 'e1a985ea469dc85f79e67f87f252509627dc14fd':
  Replace renamed reference to NetworkStats in javadoc
 2015-06-05 10:20:45 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Filip Gruszczynski
38b6cac447 am 0f5d0d54: am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '0f5d0d54d452b60a039c365a1de13e1aed5426e6':
  ActivityView: set surface on a background thread.
 2015-06-05 02:43:44 +00:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
 2015-06-05 02:18:35 +00:00
Wale Ogunwale
f318db78c2 am bb2a990b: am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit 'bb2a990bda622e0f13cf4d33cf8fe0d2c2756e07':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 00:50:59 +00:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
George Mount
74e4a76e36 am df73fd7c: am e50b091d: Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 
* commit 'df73fd7ca2552841a07c3d7b48135e866c8f28dd':
  Clean up the enter transition even if there is not entering fragment.
 2015-06-04 19:23:16 +00:00
Dianne Hackborn
4752d671f2 am 7771406d: am b0a5e78f: Merge "More API changes." into mnc-dev 
* commit '7771406d95ae5cfb83c17d0e0ed710e33925b39e':
  More API changes.
 2015-06-04 19:22:52 +00:00
George Mount
e50b091df9 Merge "Clean up the enter transition even if there is not entering fragment." into mnc-dev 2015-06-04 17:32:53 +00:00
George Mount
ec3364cc32 Clean up the enter transition even if there is not entering fragment. 
Bug 21618103

Change-Id: Id670465afd0b743f964d24d7d36d49706b459ac8
 2015-06-04 10:28:54 -07:00
Dianne Hackborn
b0a5e78fc0 Merge "More API changes." into mnc-dev 2015-06-04 16:56:52 +00:00
Wale Ogunwale
9a6ef1e94c Always have a handler for PendingIntents sent in the system process 
It is possible for deadlocks to occur when sending/processing
PendingIntents due to components like AMS holding global service
locks when dispatching the broadcast without specifying an
handler and the receiver calling back into AMS.

We now set a default handler to process the broadcast on if we
are in the system process and a handler wasn't specified.

Bug: 19502993
Change-Id: Iccde32c6c1df997784155bc41ef39e52ee0f7243
 2015-06-04 07:58:24 -07:00
Zoltan Szatmary-Ban
df70dcee68 Replace renamed reference to NetworkStats in javadoc 
Bug: 21572680
Change-Id: Iad43af4d8a6d178f3396f23a74f1568e6faed311
 2015-06-04 14:15:47 +01:00
Svetoslav
3f8a2f73ec am 21ec5f62: am 597059d5: Merge "Adding missing permission API to fragment" into mnc-dev 
* commit '21ec5f6256794755abee83c4daf8737f2ff30e10':
  Adding missing permission API to fragment
 2015-06-03 23:20:05 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment 
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
 2015-06-03 15:43:59 -07:00
Svetoslav
f766363a36 am 1df1f713: am f559546d: Merge "Add annotations to a new API" into mnc-dev 
* commit '1df1f7137edb8ffa342a2cb4384e583290ee7b24':
  Add annotations to a new API
 2015-06-03 02:22:58 +00:00
Svetoslav
f559546d8c Merge "Add annotations to a new API" into mnc-dev 2015-06-03 01:01:41 +00:00
Svetoslav
9ce9a15f62 Add annotations to a new API 
Change-Id: I41a87a0ba81b1123e06096db510a02a1d9e6531d
 2015-06-02 17:59:31 -07:00
Dianne Hackborn
69c6adc96e More API changes. 
Start moving Assist* stuff to android.app.assist.

Clean up some more of the VoiceInteractionSession APIs.

Clearly document that finish() is not the same as hide(),
always call hide() instead, and fix the finish() path to
also always do a hide to make sure everything is cleaned
up correctly.

Change-Id: I962d4069fcb34fe89547a95d395ae1b9fa3b4148
 2015-06-02 16:56:41 -07:00
Filip Gruszczynski
93634166c8 am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit 'd88e4d50d6198233883a69313fdee2c1a6fff7ca':
  ActivityView: set surface on a background thread.
 2015-06-02 22:36:42 +00:00
Nicolas Prevot
8a4dbac598 am 83366d50: am db6ac0e9: Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 
* commit '83366d500f48f73b8465c7e6cbe83c7a5aa91bbe':
  Make ACTION_PROVISION_MANAGED_DEVICE public.
 2015-06-02 22:28:46 +00:00
Svetoslav
c87f485da5 am 7c773529: am 3aa3f5f8: Merge "Fix java doc" into mnc-dev 
* commit '7c773529afeff7d88386045c75b1eab994ae4ea9':
  Fix java doc
 2015-06-02 22:28:42 +00:00
Svetoslav
12e7abc659 am 703c7f9e: am c5ff0020: Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 
* commit '703c7f9e776bb900f19c4dc30c03c6a22c833aba':
  Add API to hint whether to show on-board UI before a permission request.
 2015-06-02 22:15:46 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Svetoslav
3aa3f5f892 Merge "Fix java doc" into mnc-dev 2015-06-02 22:09:18 +00:00
Svetoslav
aa048b6242 Fix java doc 
Change-Id: I927a1766e1e4cac99d0d7999fef568b82af769af
 2015-06-02 15:08:48 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request. 
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
 2015-06-02 14:48:38 -07:00
Amith Yamasani
9984f181c5 am 52f26b63: am ff3b76d0: Merge "Temporarily whitelist an app for network during doze" into mnc-dev 
* commit '52f26b6399cd28bfaa5822cb4c3a5340404f7800':
  Temporarily whitelist an app for network during doze
 2015-06-02 21:10:40 +00:00
Robin Lee
9aa9054169 am 805402de: am 02a400ca: Merge "Device policy: consistent javadoc and annotations" into mnc-dev 
* commit '805402de76dc983b2b785d77531f81ab6eea5f87':
  Device policy: consistent javadoc and annotations
 2015-06-02 21:10:18 +00:00
Robin Lee
24613fae6b am b3530734: am f4d9ecc5: Merge "Revert "Consistent documentation and annotations for DPMS"" into mnc-dev 
* commit 'b35307343a72a24165e8adceec2fba8222ef86eb':
  Revert "Consistent documentation and annotations for DPMS"
 2015-06-02 21:09:09 +00:00
Robin Lee
b95551290a am 9b286dd6: am 5de95550: Merge "Consistent documentation and annotations for DPMS" into mnc-dev 
* commit '9b286dd637775d157b273cdb8dfec9e83af5c050':
  Consistent documentation and annotations for DPMS
 2015-06-02 21:09:03 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public. 
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
 2015-06-02 14:04:41 -07:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Robin Lee
25e264507c Device policy: consistent javadoc and annotations 
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted/fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: Iadfa78c5170bf4899a9daaf93c3d4e9d8b170a45
 2015-06-02 11:55:21 -07:00
Robin Lee
49ec19ef6c Revert "Consistent documentation and annotations for DPMS" 
This reverts commit 695142a17a.

Change-Id: Iaa2abe7e8bcecc5177a395b0dab8f66cc7100d3d
 2015-06-02 18:25:28 +00:00
Robin Lee
695142a17a Consistent documentation and annotations for DPMS 
Annotated all uses of the ComponentName parameter to methods in
DevicePolicyManager to indicate whether null is acceptable.

Deleted or fixed some inconsistent or poorly-worded documentation.

Bug: 21422939
Change-Id: I8d86d0968c2af3595f268828ea1625f1ed256d50
 2015-06-02 11:15:34 -07:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze 
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
 2015-06-02 11:05:03 -07:00
Dianne Hackborn
4f57deb990 am 0d69c19d: am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev 
* commit '0d69c19dcdc3df11c28d3981b086c40e94d860be':
  Update VoiceInteractionService from API review.
 2015-06-02 14:21:28 +00:00
Dianne Hackborn
9ed0c4109d Merge "Update VoiceInteractionService from API review." into mnc-dev 2015-06-01 22:28:45 +00:00
Filip Gruszczynski
2df62bf0dd ActivityView: set surface on a background thread. 
ActivityView shouldn't set the surface on the main thread, because it's
a binder call and causes jank. Instead it should delegate the call to a
background thread and let it do the work there.

Bug: 15752100

Change-Id: I6f2764c93dfb8f3e00d79f0e97d4a6688b6fdd8f
 2015-06-01 13:24:12 -07:00
Dianne Hackborn
2ee5c368f8 Update VoiceInteractionService from API review. 
This may even manage to retain compatibility with existing
binaries!  (For now.)

Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
 2015-06-01 11:42:04 -07:00
Barnaby James
fab12f200a am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 
* commit '4ead90a1c200f144e91d176b4c1627b1bad37f45':
  Minor VoiceInteractor documentation fixes.
 2015-06-01 17:09:02 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
 2015-06-01 15:26:00 +00:00