Commit Graph

5448 Commits

Author SHA1 Message Date
Fyodor Kupolov
47ed3195f9 Merge "Allow alternative policy description for secondary users" 2015-02-25 20:17:21 +00:00
Jim Miller
74160d8cdb am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a':
  Remove TrustAgent whitelisting API
2015-02-25 18:30:10 +00:00
Jim Miller
b060f018ef am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API
2015-02-25 18:23:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
Wale Ogunwale
53a29a90f3 Added ActivityManager API and AM command to resize a task.
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.

Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
2015-02-24 09:33:18 -08:00
Fyodor Kupolov
b343d6db28 Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: Idadbdf84d378cf4f1b42ac246a48edbfa97eaa9a
2015-02-24 09:26:09 -08:00
Mike Lockwood
f3c7276a4f Merge "Add MIDI Manager API tweaks:" 2015-02-23 23:03:36 +00:00
Mike Lockwood
b673770f71 Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi

- Add option for specifying a Handler for DeviceCallback notifications

Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
2015-02-23 14:32:23 -08:00
Scott Kennedy
7be99fc667 Merge "Add some more @Nullable annotations" 2015-02-23 19:09:19 +00:00
Scott Kennedy
3c32b62044 Add some more @Nullable annotations
Change-Id: I586d542e087eafa8355f0eaa606d66876c0f5a56
2015-02-22 20:43:56 -08:00
Ying Wang
7f38aab7ab Fix docs.
Change-Id: Iaa7f498dac5b87ee8f3cc6cfeabb04b51ce93245
2015-02-20 11:50:09 -08:00
Alexandra Gherghina
eeab1fa96c Merge "New intent action for returning account migration result" 2015-02-20 16:46:24 +00:00
John Reck
df570c6e66 Merge "Initial attempt at jank-tracking stat collection" 2015-02-20 16:28:30 +00:00
John Reck
ba6adf66d3 Initial attempt at jank-tracking stat collection
Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
2015-02-20 08:27:38 -08:00
Alexandra Gherghina
db4bc57760 New intent action for returning account migration result
Bug: 18551835
Change-Id: Ifc5dedf1753a7779793a8b056bac5f5733a2783d
2015-02-20 11:55:52 +00:00
Scott Kennedy
7db73ed198 Mark Service#onBind() @Nullable
Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
2015-02-19 15:31:11 -08:00
Wale Ogunwale
9176a30d36 Merge "Set compatInfo to default if unset in ContextImpl constructor." 2015-02-19 01:05:29 +00:00
Wale Ogunwale
9cf9954432 Set compatInfo to default if unset in ContextImpl constructor.
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
2015-02-18 16:31:34 -08:00
Tor Norbye
7b9c912f53 Add @ResourceInt annotations on APIs
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
2015-02-18 07:49:03 -08:00
Wale Ogunwale
0233aee840 Merge "Fixed NPE in ResourceManager when Activity.recreate is called." 2015-02-18 03:23:39 +00:00
Wale Ogunwale
93f543ca98 Fixed NPE in ResourceManager when Activity.recreate is called.
Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
2015-02-17 16:55:03 -08:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:53:11 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:43:33 +00:00
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 20:41:39 +00:00
Craig Mautner
aa7e3ed947 Do not make ActivityContainer available to apps.
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 10:31:20 -08:00
Robin Lee
abf3570f38 DevicePolicy: Make uid parameter an int
This should not have been a long to begin with.

Change-Id: Icbf6e2e97cb6301b968b3eb8b3f9a46331f7983e
2015-02-17 14:18:32 +00:00
Robin Lee
f6901eb9e2 Merge "Device Policy API to choose a private key silently" 2015-02-16 10:47:51 +00:00
Wale Ogunwale
421d6ad191 Merge "Adjust activity display metrics based on stack configuration." 2015-02-15 20:20:08 +00:00
Wale Ogunwale
7c72668f19 Adjust activity display metrics based on stack configuration.
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.

Bug: 19225079
Bug: 19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
2015-02-13 21:12:47 -08:00
Dianne Hackborn
682c8e509b Merge "Update voice interaction layer for new UI design." 2015-02-13 20:16:04 +00:00
Dianne Hackborn
ae6688b096 Update voice interaction layer for new UI design.
Can switch from a pure overlay at the top of the screen,
to interactive mode with the voice UI drawing at the bottom
and pushing its target activity up like an IME.

Add mechanism to get assist data to the voice interaction UI.

Add some basic visualization of the assist data, outlining
where on the screen we have text.

Add a test ACTION_ASSIST handler, which can propagate the
assist data it gets to the voice interaction session so
you can see what kind of data we are getting from different
apps.

Change-Id: I18312fe1601d7926d1fb96a817638d60f6263771
2015-02-13 11:27:57 -08:00
Chet Haase
50dd4c1c59 Merge "Add ClipReveal window transition for application launch" 2015-02-13 19:02:15 +00:00
Chet Haase
10e23ab61b Add ClipReveal window transition for application launch
Issue #19362772 Better material launch animations

Change-Id: Ic94fde910b6b5554ee954dfbbf374949f9eb189d
2015-02-13 11:00:55 -08:00
John Spurlock
b25334ca3c Merge "Allow sysui-managed remote volume controllers." 2015-02-13 14:50:50 +00:00
John Spurlock
cdb57aeb0e Allow sysui-managed remote volume controllers.
- Relax restriction on audio service calls that assume the volume
  ui is systemui, allow calls from a blessed component app.
- Blessed component app service saved in secure settings.
- SystemUI mediates requests to replace the volume dialog, prompts
  the user on activation.
- Show a low pri ongoing notification when the volume dialog is
  being replaced, to allow user restoration at any time.
- Replace the controller management code in VolumeUI to use a
  ServiceMonitor, backed by the new blessed app component setting.
- Add proper zen-related noman client wrappers, make avail to the
  registered volume controller.
- Everything is still @hidden, no api impact.

Bug: 19260237
Change-Id: Ie1383f57659090318a7eda737fdad5b8f88737d4
2015-02-12 22:48:37 -05:00
Benjamin Franz
d51584dee7 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
automerge: 6076ef9

* commit '6076ef9355fec90c40d84abaf2c71345f32badfb':
  Fix the javadocs for lock task mode intents.
2015-02-12 19:37:50 +00:00
Alan Viverette
4cc1e9e707 Add support for user-selectable night mode
Adds a Material theme that automatically selects light or dark UI based
on the night mode resource qualifier.

Removes restriction that night mode only works when car mode is enabled
or the device is docked, which was applied inconsistently anyway and
only actually worked when in car mode (regardless of docked state).
Night mode is now always applied according to the system preference.

Change-Id: I526807c907eb29a2ab588d15932afe3e6ab180c2
2015-02-12 11:01:06 -08:00
Benjamin Franz
6076ef9355 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
  Fix the javadocs for lock task mode intents.
2015-02-12 17:02:09 +00:00
Benjamin Franz
dd0027cfda am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
  Fix the javadocs for lock task mode intents.
2015-02-12 16:52:34 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents.
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
2015-02-12 16:12:58 +00:00
Scott Kennedy
c051955392 Mark findViewById(int) @Nullable
Change-Id: I9bf7c08a896bd9c28400ff832179abc579fd502f
2015-02-11 15:33:10 -08:00
Pirama Arumuga Nainar
21761bc5de am 0cc09449: Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39 automerge: 1641e19
* commit '0cc09449b6b1e418a7d04590e28d1336694230ba':
  Store compiled code in Context.getCodeCacheDir()
2015-02-11 17:23:12 +00:00
Pirama Arumuga Nainar
0cc09449b6 Merge "Store compiled code in Context.getCodeCacheDir()" automerge: 3fbbe39
automerge: 1641e19

* commit '1641e192a82e266159e0b82078a8f98ebcd3d8ff':
  Store compiled code in Context.getCodeCacheDir()
2015-02-11 17:15:47 +00:00
Pirama Arumuga Nainar
51772b7601 Store compiled code in Context.getCodeCacheDir()
bug 16345623

Use Context.getCodeCacheDir for EGL shader cache and RenderScript
compiled code.

Change-Id: I54c4e43674bd1f9342ae13059cb8899f4a3f4734
2015-02-10 13:17:30 -08:00
Wale Ogunwale
5fa84cde30 Merge "Include stack override configurations in onConfigurationChanged() call." 2015-02-10 16:54:03 +00:00
Wale Ogunwale
dea0bbbeea Merge "Remove ContextImpl.mOverrideConfiguration to reduce code confusion." 2015-02-10 16:49:44 +00:00
Calin Juravle
399f8a6d17 am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." automerge: d1e074a
automerge: 16df82d

* commit '16df82d7ace0dbe625211561ccec9b6faf81debb':
  Get the instruction set that the libraries of secondary Abi is supported.
2015-02-10 16:30:46 +00:00
Calin Juravle
16df82d7ac am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported."
automerge: d1e074a

* commit 'd1e074a72452c909c7ed2a4baf220d9d2f306b20':
  Get the instruction set that the libraries of secondary Abi is supported.
2015-02-10 16:23:51 +00:00
Calin Juravle
fd523efcde Merge "Get the instruction set that the libraries of secondary Abi is supported." 2015-02-10 16:13:30 +00:00