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

5603 Commits

Author SHA1 Message Date
Nicolas Prevot
1985f4963a am aa1185dc: am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'aa1185dc44347d1af713ec78b4a294683758b806':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:25:55 +00:00
Yuncheol Heo
4034241d99 am fb981efb: am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit 'fb981efbd0ba116433fc869ce3b1370a946eb057':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:25:51 +00:00
Nicolas Prevot
aa1185dc44 am ea728d75: Merge "Add a cross-profile intent filter only if it wasn\'t previously added." into lmp-mr1-dev automerge: b9744c1 
* commit 'ea728d75ebb228822690365d147fc4021fb87ce9':
  Add a cross-profile intent filter only if it wasn't previously added.
 2014-11-06 15:20:57 +00:00
Yuncheol Heo
fb981efbd0 am 9188df6e: CEC: Allow no parameters with <System Audio Mode Request>. automerge: 0361147 
* commit '9188df6ef00a05fc15f2acf290e40c389ec7c847':
  CEC: Allow no parameters with <System Audio Mode Request>.
 2014-11-06 15:20:51 +00:00
Nicolas Prevot
b9744c1c1f Merge "Add a cross-profile intent filter only if it wasn't previously added." into lmp-mr1-dev 2014-11-06 09:42:47 +00:00
Yuncheol Heo
03611473bc CEC: Allow no parameters with <System Audio Mode Request>. 
Bug: 18266992
Change-Id: I4399e34d1178f3d4b17b4749ca543c2bb14c0765
 2014-11-06 08:27:58 +00:00
Yuncheol Heo
02d5ee944f am 472cfdb9: am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit '472cfdb967a3ead8bf41e0845897e8a8a338e7c3':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 06:03:28 +00:00
Yuncheol Heo
472cfdb967 am d87c32aa: am ff636d38: Merge "CEC: Don\'t send <Feature Abort> on the short message" into lmp-mr1-dev 
* commit 'd87c32aa859ef54c6bce923c52725edf44538488':
  CEC: Don't send <Feature Abort> on the short message
 2014-11-06 05:58:53 +00:00
Yuncheol Heo
ff636d383c Merge "CEC: Don't send <Feature Abort> on the short message" into lmp-mr1-dev 2014-11-06 05:47:49 +00:00
Jim Miller
cc56956025 am 767ae175: am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '767ae175fab5a93f4948b3722549448eb4b55e41':
  Update TrustAgentService API after review
 2014-11-06 03:12:08 +00:00
Jim Miller
767ae175fa am 6230cdf5: am 262dc4da: Merge "Update TrustAgentService API after review" into lmp-mr1-dev 
* commit '6230cdf5721f11660e2c0fec1c5695346a9001d0':
  Update TrustAgentService API after review
 2014-11-06 03:07:09 +00:00
Jim Miller
262dc4dafe Merge "Update TrustAgentService API after review" into lmp-mr1-dev 2014-11-06 02:52:20 +00:00
Yuncheol Heo
a95f1a9b89 CEC: Don't send <Feature Abort> on the short message 
Bug: 18261915
Change-Id: I722392afacc29ec9f2af27df49b68bd773b53e3d
 2014-11-06 11:27:25 +09:00
Jim Miller
e303bf4435 Update TrustAgentService API after review 
This change incorporates API council feedback and enables the
TrustAgent whitelisting API.

It also contains a minor cleanup of DPM's use of UserHandle
to eliminate unnecessary object creation.

Fixes bug 17008504

Change-Id: I63cc50169fde54b34406845818bcaf6aadc1a3db
 2014-11-05 18:17:56 -08:00
Jeff Davidson
83bdea71c9 am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
automerge: f680c84

* commit 'f680c8434a737873c98231f6d9863e71c43a6783':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 02:09:10 +00:00
Jeff Davidson
f680c8434a am 63226dd8: Merge "Allow apps with SCORE_NETWORKS to set the active scorer." into lmp-mr1-dev automerge: 24f535b 
* commit '63226dd8f3570bd3b28e4241668843385ba99c2d':
  Allow apps with SCORE_NETWORKS to set the active scorer.
 2014-11-06 01:48:45 +00:00
Jeff Davidson
e56f2bb5ec Allow apps with SCORE_NETWORKS to set the active scorer. 
This allows for a more streamlined UX in the current world, where
scorer apps are trusted (by virtue of being in /system/priv-app).
Trusted apps can continue to use the system dialog for consent, but
they may also set the scorer directly, under the assumption that they
are using their own consent UX to explain the feature to the user.

Bug: 16577529
Change-Id: I2a6edb7f1f688aaacf9b0152fa1da1a88636c3dc
 2014-11-05 14:25:20 -08:00
Winson Chung
2da3e70008 am f4b1c8d7: am 5284dd8d: am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit 'f4b1c8d7caa33124daa355b8adce6feba1224f6a':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:56:57 +00:00
Winson Chung
f4b1c8d7ca am 5284dd8d: am 91283969: Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 
* commit '5284dd8d6933156ee785d3270754cc6671252625':
  Fixing crash in recents window transition.  (Bug 18246975, 18159006)
 2014-11-05 21:51:38 +00:00
Jeff Davidson
3527aa01cd am fb68a976: am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'fb68a9762087a262146eec5d0e0d3fbdbdf25b6b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:48:16 +00:00
Jeff Davidson
fb68a97620 am dd40ccf3: am b42bdef5: Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 
* commit 'dd40ccf36203c740aea3849f54495d1287d02b2b':
  Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED.
 2014-11-05 21:43:10 +00:00
Winson Chung
9128396982 Merge "Fixing crash in recents window transition. (Bug 18246975, 18159006)" into lmp-mr1-dev 2014-11-05 21:39:16 +00:00
Jeff Davidson
b42bdef51c Merge "Rename BROADCAST_SCORE_NETWORKS to BROADCAST_NETWORK_PRIVILEGED." into lmp-mr1-dev 2014-11-05 21:33:16 +00:00
John Spurlock
4901badeca am 7847a7f8: am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '7847a7f8f4b682e6776439058216796d351cb693':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:52:59 +00:00
John Spurlock
7847a7f8f4 am 6ccb72e9: Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev automerge: 2f9e7f6 
* commit '6ccb72e9940df9b50a213fa84483ed5da9780cd0':
  Zen: Add the ability to enter "None" mode during downtime.
 2014-11-05 20:43:18 +00:00
Craig Mautner
80fd257094 am b3d26022: Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 automerge: a72b222 
* commit 'b3d260222fd003c8b537bb9f86625a200bd0f999':
  When keyguard exits use same anim for all windows
 2014-11-05 20:15:51 +00:00
Craig Mautner
b3d260222f Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev automerge: 3f36ba6 
automerge: a72b222

* commit 'a72b2228c278363c2ff5bd38f9a8b36e3c4cd70c':
  When keyguard exits use same anim for all windows
 2014-11-05 20:01:56 +00:00
John Spurlock
2f9e7f6d8b Merge "Zen: Add the ability to enter "None" mode during downtime." into lmp-mr1-dev 2014-11-05 19:17:39 +00:00
John Spurlock
cc30c8d729 Zen: Add the ability to enter "None" mode during downtime. 
Updates to the shared config structure and the service backend.

Bug: 16373455
Change-Id: I45761690ba6b32eb81c9e2a5c1f2d4adad93e58d
 2014-11-05 14:12:30 -05:00
Craig Mautner
3f36ba647d Merge "When keyguard exits use same anim for all windows" into lmp-mr1-dev 2014-11-05 19:07:59 +00:00
Jeff Davidson
b2e27cd6b8 am a820564d: am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'a820564d9c43f2a3241339aec9ba08803e37b3ed':
  Update network selections on capability change.
 2014-11-05 19:01:36 +00:00
Filip Gruszczynski
0f337b776b am cac8e4a5: am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit 'cac8e4a5aaf35e1dae23da3b4557d8f3d37c07b8':
  Automatic brightness using ALS while dozing.
 2014-11-05 19:01:26 +00:00
Jeff Davidson
a820564d9c am d9685fac: am ea651a4f: Merge "Update network selections on capability change." into lmp-mr1-dev 
* commit 'd9685fac35c1c3ba797eb9e534ec15888aaa3a8b':
  Update network selections on capability change.
 2014-11-05 18:55:40 +00:00
Filip Gruszczynski
cac8e4a5aa am 093e9890: am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 
* commit '093e98908743eb37104a280541a060dcd46351d0':
  Automatic brightness using ALS while dozing.
 2014-11-05 18:55:34 +00:00
Andres Morales
5bc105f0e6 am a4341f9c: Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3 automerge: 3bc103b 
* commit 'a4341f9cf33d3844623fbed0f0e998a5f158f67d':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
 2014-11-05 18:47:40 +00:00
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 18:47:27 +00:00
Craig Mautner
276a6eb879 When keyguard exits use same anim for all windows 
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.

Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.

This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.

(Also refactorings to eliminate redundant code and unnecessary
variables.)

Fixes bug 15991916.

Change-Id: I844d102439b6eda8c912108431916e04b12f7298
 2014-11-05 10:47:14 -08:00
Andres Morales
a4341f9cf3 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3 
automerge: 3bc103b

* commit '3bc103b8dbcacf908e6512b805c89a399a460be9':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
 2014-11-05 18:05:14 +00:00
Jeff Davidson
ea651a4fbf Merge "Update network selections on capability change." into lmp-mr1-dev 2014-11-05 17:41:36 +00:00
Filip Gruszczynski
34afdf0276 Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 2014-11-05 17:39:34 +00:00
Andres Morales
36531b33b8 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev 2014-11-05 16:01:24 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
 2014-11-05 15:42:30 +00:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm". 
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
 2014-11-05 08:46:01 -05:00
Jungshik Jang
4acb768ce8 am af45240b: am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit 'af45240bf06faa649cc60be560159de0d246b6a9':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:33:33 +00:00
Jungshik Jang
af45240bf0 am 9ae3fe48: am 09035486: Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 
* commit '9ae3fe48d912d9135684d435d282fa2bb4929a2e':
  Add recorder address to all recording listerner apis.
 2014-11-05 06:29:24 +00:00
Jungshik Jang
090354861a Merge "Add recorder address to all recording listerner apis." into lmp-mr1-dev 2014-11-05 05:54:15 +00:00
Alan Viverette
0290aa8465 am c128a576: am 3ea1a3e7: am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit 'c128a576f678e0e4558fb3eea067d3ff85863d26':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:54:15 +00:00
Alan Viverette
c128a576f6 am 3ea1a3e7: am 44eb8b77: Revert "When keyguard exits use same anim for all windows" 
* commit '3ea1a3e781717dee16e3338db6fc59d1358d76ed':
  Revert "When keyguard exits use same anim for all windows"
 2014-11-05 04:47:47 +00:00
Alan Viverette
44eb8b7729 Revert "When keyguard exits use same anim for all windows" 
Broke window animations.

This reverts commit b83408018176ec58f50e792590a22fdc9eb87fff.

BUG: 18248641
Change-Id: Ic456a5666c3199e8bb8c9c2fb1ecdbb82afaad86
 2014-11-04 20:34:41 -08:00