Commit Graph

7198 Commits

Author SHA1 Message Date
Nicolas Prévot
4e8bbd23e5 Merge "Allow privileged apps to set the organization color." into nyc-dev am: eff90bd5ff
am: 2da7b6ebdb

* commit '2da7b6ebdb3ade426fa7b69ed0b47779d15ab109':
  Allow privileged apps to set the organization color.
2016-02-15 10:57:17 +00:00
Nicolas Prévot
2da7b6ebdb Merge "Allow privileged apps to set the organization color." into nyc-dev
am: eff90bd5ff

* commit 'eff90bd5ff6bd50325149a5010183277bd76f4c6':
  Allow privileged apps to set the organization color.
2016-02-15 10:51:42 +00:00
Nicolas Prévot
eff90bd5ff Merge "Allow privileged apps to set the organization color." into nyc-dev 2016-02-15 10:47:41 +00:00
Julia Reynolds
463b8f9f31 Merge "Show topic settings inline if user has configured topics." into nyc-dev am: 597c6d8c5d
am: acfdf4b6ee

* commit 'acfdf4b6eeb4c6dd03aa54afad7aeb885e26a21f':
  Show topic settings inline if user has configured topics.
2016-02-12 20:46:04 +00:00
Julia Reynolds
acfdf4b6ee Merge "Show topic settings inline if user has configured topics." into nyc-dev
am: 597c6d8c5d

* commit '597c6d8c5de14340550313607d0925b8ee40fea9':
  Show topic settings inline if user has configured topics.
2016-02-12 20:40:37 +00:00
Julia Reynolds
597c6d8c5d Merge "Show topic settings inline if user has configured topics." into nyc-dev 2016-02-12 20:31:55 +00:00
Paul Miller
0b651a0096 Merge "Fail nicely in Activity.requestPermissions when requestCode < 0" 2016-02-12 17:41:32 +00:00
Julia Reynolds
fec58c263c Show topic settings inline if user has configured topics.
Change-Id: Icf51faad61b3ae4261991691a1d679b190ea712a
2016-02-12 11:42:02 -05:00
Clara Bayarri
c1a258c813 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev am: 29b13190cd
am: ecc95de0f3

* commit 'ecc95de0f33aa3e63d34ed0cd3fc4597b04c93be':
  Add support for current failed lock attempts and max attempts
2016-02-12 14:04:13 +00:00
Clara Bayarri
ecc95de0f3 Merge "Add support for current failed lock attempts and max attempts" into nyc-dev
am: 29b13190cd

* commit '29b13190cd57bd823eb803f6fca03f671a32a5fe':
  Add support for current failed lock attempts and max attempts
2016-02-12 14:00:41 +00:00
Clara Bayarri
29b13190cd Merge "Add support for current failed lock attempts and max attempts" into nyc-dev 2016-02-12 13:54:10 +00:00
Clara Bayarri
51e41ad887 Add support for current failed lock attempts and max attempts
This is needed from Settings to show a message informing the user
of the number of attempts before their work profile gets wiped
when using ConfirmDeviceCredentials.

Bug: 26677759
Change-Id: I4b16f7dc2f415d0ce0215a3b7a646f98fabece33
2016-02-12 13:50:43 +00:00
Nicolas Prevot
8f7698aaf6 Allow privileged apps to set the organization color.
BUG:26923835
Change-Id: I97b0cbbc0d4fb9e9ca0e3d335a9d15eb5a1f9602
2016-02-12 10:23:32 +00:00
Jorim Jaggi
736593e765 Merge "Handle light status bar for split-screen" into nyc-dev am: e26334ba1a
am: aa836177c3

* commit 'aa836177c3c9a0eeef5d3419220693af48a1eb5e':
  Handle light status bar for split-screen
2016-02-12 03:21:18 +00:00
Jorim Jaggi
aa836177c3 Merge "Handle light status bar for split-screen" into nyc-dev
am: e26334ba1a

* commit 'e26334ba1a5c7880c67b931a6ca73941167712e9':
  Handle light status bar for split-screen
2016-02-12 03:16:54 +00:00
Jorim Jaggi
e26334ba1a Merge "Handle light status bar for split-screen" into nyc-dev 2016-02-12 03:12:18 +00:00
Winson Chung
b8a40f1331 Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev am: 34f5c494df
am: be0537a4e1

* commit 'be0537a4e133d29848efd2458acf12f995a5823b':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 01:08:38 +00:00
Winson Chung
be0537a4e1 Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
am: 34f5c494df

* commit '34f5c494df827c6f757cbfd50cb61b43e222f80e':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:36:15 +00:00
Winson Chung
34f5c494df Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev
* changes:
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.
2016-02-12 00:29:43 +00:00
Paul Miller
77a0e13b41 Fail nicely in Activity.requestPermissions when requestCode < 0
BUG:24976189
Change-Id: I0e2fbb7c075370b0ec8b1eb5b405f7a6ca8de1e9
2016-02-11 13:46:49 -08:00
Dianne Hackborn
b39ee5ed8e Merge "Implement transient extras for jobs." 2016-02-11 20:54:53 +00:00
Jorim Jaggi
8690558241 Handle light status bar for split-screen
In split-screen the light status bar flag for one side of the
status bar can be different from the other side.
SYSTEM_UI_FLAG_LIGHT_STATUS_BAR is now reported for both
the fullscreen stack and docked stack, but not anymore in the
"default" SysUI visibility field when reporting a visibility
change to SystemUI. The change also reports the docked stack
and the fullscreen stack bounds, so SystemUI can guard tinting
the icons on whether the icon is one of the areas.

When calculating the light status bar flag in PWM, we keep track
of the top fullscreen opaque window state for the docked and
fullscreen stack separately.

Bug: 24365214
Change-Id: Id2240a86d75bf96e0138ec7652a4793859f56e3c
2016-02-11 12:18:40 -08:00
Selim Cinek
afaaf427da Merge "Added support for media notifications without expanded state" into nyc-dev
am: 635f71925a

* commit '635f71925a065b155b2c6ca8851f15fa9c185422':
  Added support for media notifications without expanded state
2016-02-11 19:53:45 +00:00
Winson Chung
1af8eda6ea Drawing thumbnail background color for empty space in view.
Change-Id: I2e8dfbe9c11a61876956658eff0674adb26d855d

Signed-off-by: Winson <winsonc@google.com>
2016-02-11 11:48:33 -08:00
Selim Cinek
635f71925a Merge "Added support for media notifications without expanded state" into nyc-dev 2016-02-11 19:37:50 +00:00
Dianne Hackborn
ba60473a65 Implement transient extras for jobs.
You can now associate an arbitrary Bundle of extras with a job,
as long as the job is not persisted.

Also implement deep-copy of Bundle.

Change-Id: I7890d627492b664d9b1f039e8cb82f8868de7be3
2016-02-11 11:28:48 -08:00
Michal Karpinski
17ae75883b Log strength of auth method used into security log
am: ed5c8f0216

* commit 'ed5c8f0216bf97e896936e2a2e24fc3fb18303a1':
  Log strength of auth method used into security log
2016-02-11 11:05:43 +00:00
Michal Karpinski
ed5c8f0216 Log strength of auth method used into security log
As approved by Android Security team, added logging of
strength of auth method as well as logging of fingerprint
keyguard actions.

Bug: 26841997
Change-Id: Ic8e3f125f775a7585fe56003f4c6442390edea61
2016-02-11 10:36:56 +00:00
Selim Cinek
cc10bfbaaa Added support for media notifications without expanded state
Bug: 26837953
Change-Id: I9fcf56013c44a2420367ef0a908dc45992c8a766
2016-02-10 20:27:53 -08:00
Suprabh Shukla
8cb1196fab Merge "Added an api to uninstall a packge with active DAs" into nyc-dev
am: 338c1d8607

* commit '338c1d860772edc3101ed4860a149e7f3c5fe493':
  Added an api to uninstall a packge with active DAs
2016-02-10 23:10:58 +00:00
Suprabh Shukla
338c1d8607 Merge "Added an api to uninstall a packge with active DAs" into nyc-dev 2016-02-10 22:47:59 +00:00
Suprabh Shukla
a2ae2238e5 Added an api to uninstall a packge with active DAs
The api deactivates all the active admins in the package, then force
stops the package and starts the uninstall intent for the package. This
is intended to provide an easy way for a user to delete a misbehaving
Device Admin

Bug: b/22359208
cherrypick of Ic7ddd89ef6db53e7e76f805808d9e806100374db

Change-Id: I0d677839120c46f22231a7d6f9cf6630cb020227
2016-02-10 13:57:22 -08:00
Adrian Roos
2b2b09ad45 Make actions extend over the whole action rail am: 9b123cf9bb
am: a63cca0b24

* commit 'a63cca0b24a9f6f03f1a07f278df49bd1f71b41f':
  Make actions extend over the whole action rail
2016-02-10 19:36:52 +00:00
Adrian Roos
a63cca0b24 Make actions extend over the whole action rail
am: 9b123cf9bb

* commit '9b123cf9bb50f98064ee0a8eed38601ca7c03564':
  Make actions extend over the whole action rail
2016-02-10 19:18:03 +00:00
Adrian Roos
9b123cf9bb Make actions extend over the whole action rail
Bug: 26767249
Change-Id: I3c67f1de40b218aa21f0a1f68bda1032c0804a14
2016-02-10 18:39:40 +00:00
Adrian Roos
6e428f82f4 Isolate Keyguard from main thread badness am: 691546e5b7
am: c9ad3299e3

* commit 'c9ad3299e3c7049d2e219eb9fc33b479fce17ba3':
  Isolate Keyguard from main thread badness
2016-02-10 18:25:57 +00:00
Adrian Roos
c9ad3299e3 Isolate Keyguard from main thread badness
am: 691546e5b7

* commit '691546e5b7f94a6e2d76630ee1287e0b9c69e7a8':
  Isolate Keyguard from main thread badness
2016-02-10 18:22:26 +00:00
Adrian Roos
691546e5b7 Isolate Keyguard from main thread badness
Adds a bindService variant to run the ServiceConnection callbacks
on a dedicated Handler.

Changes KeyguardService binding to use the foreground thread
instead of the main thread and changes state to the
KeyguardScrim on the UI thread.

Bug: 26954967
Change-Id: I9d7bd85382816cd0e23772b14ff6518266a9d232
2016-02-10 18:17:29 +00:00
Rubin Xu
0816fcfd79 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev am: 1f3895b9d9
am: c21e6894e0

* commit 'c21e6894e026de1fe2a08e27b200b39fd973922a':
  Require delegated cert installer and app restriction manager to exist
2016-02-10 16:43:46 +00:00
Rubin Xu
c21e6894e0 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev
am: 1f3895b9d9

* commit '1f3895b9d996b138e96a8faa3356faccada75e18':
  Require delegated cert installer and app restriction manager to exist
2016-02-10 16:39:18 +00:00
Rubin Xu
1f3895b9d9 Merge "Require delegated cert installer and app restriction manager to exist" into nyc-dev 2016-02-10 16:29:35 +00:00
Rubin Xu
f03d0a6bfc Require delegated cert installer and app restriction manager to exist
Enforce that apps with delegated powers to exist on device before
empowering them. This is consistent with DevicePolicyManagerService's
internal logic to clear the delegation power once the package is removed.
For delegated cert installer, only enforce this new restriction on
device admins targeting N or later.

Bug: 26233778
Change-Id: Ia8f45dfd5290958cebb36991c4b6baa03e8c28ae
2016-02-10 16:29:01 +00:00
Julia Reynolds
bf7cf7e19f Merge "Allow apps to know what users think of their notifications." into nyc-dev am: 146d931ece
am: 9ad07f5c6e

* commit '9ad07f5c6eccc2ae46de2660af29c50cd2148a54':
  Allow apps to know what users think of their notifications.
2016-02-10 14:17:44 +00:00
Julia Reynolds
9ad07f5c6e Merge "Allow apps to know what users think of their notifications." into nyc-dev
am: 146d931ece

* commit '146d931ece7fc273311c049067742bab40a9999a':
  Allow apps to know what users think of their notifications.
2016-02-10 14:14:44 +00:00
Julia Reynolds
146d931ece Merge "Allow apps to know what users think of their notifications." into nyc-dev 2016-02-10 14:10:24 +00:00
Elliott Hughes
b79064bd0a Merge "The NDK samples moved a while back." am: 9653790de2
am: 1ac526df67

* commit '1ac526df67af568f47dd1bfa767928c0d268b6cb':
  The NDK samples moved a while back.
2016-02-10 09:22:13 +00:00
Svetoslav Ganov
1bd77c440c Merge "Add an API to query the package name of the services shared lib" into nyc-dev am: e0feadcaac
am: 43e8c55e0f

* commit '43e8c55e0f0d394112517619e376a94ab955f001':
  Add an API to query the package name of the services shared lib
2016-02-10 09:20:04 +00:00
Elliott Hughes
1ac526df67 Merge "The NDK samples moved a while back."
am: 9653790de2

* commit '9653790de25dfa77076701c3c2932ea93b7f9968':
  The NDK samples moved a while back.
2016-02-10 04:50:01 +00:00
Svetoslav Ganov
e0feadcaac Merge "Add an API to query the package name of the services shared lib" into nyc-dev 2016-02-10 03:00:09 +00:00
Svet Ganov
d7b1f41109 Add an API to query the package name of the services shared lib
The servcies shared lib contains components apps can invoke such
as services to bind to, activities to start, UI choosers, etc.
This lib is built from AOSP code but an OEM may chage its
package name. For example, Google renames the package names for
GMS apps from android.foo.bar to com.google.android.foo.bar.
While we have more than one shared lib that are a part of the
platform (currently shared and services libs) the serivces lib
is the only one clients need to start components in, thus need
to know its package name. This change adds an API to query the
package name of the services shared lib. The API is hidden as
currently the only clients are a part of the system.

Change-Id: Ied48fa4819024522791764b22b3336d4f4b42cc3
2016-02-09 18:49:27 -08:00