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

182018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
4b79268cb7 Merge "camera2: Formatting nitpicks." 2015-02-10 21:20:28 +00:00
Shanea King-Roberson
8fcfd06ce5 am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c automerge: accf077 
automerge: 524c460

* commit '524c46001f3f55552194b774c2e89c8c0ff0507c':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 21:01:45 +00:00
Shanea King-Roberson
524c46001f am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c 
automerge: accf077

* commit 'accf0770306419773c3119eb32ca912077894b11':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:50:57 +00:00
Amith Yamasani
91e5f76854 Merge "Timeout to ensure user-switching dialog is closed" 2015-02-10 20:44:04 +00:00
Chris Warrington
ed335664f9 am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev automerge: 4499888 
automerge: 4308c2a

* commit '4308c2aea45a4780b460734ee8634d74205c15c5':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:34:58 +00:00
Shanea King-Roberson
accf077030 am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
automerge: 696b68c

* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:25:34 +00:00
Shanea King-Roberson
696b68c4fc am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:17:53 +00:00
Amith Yamasani
5e5cb463b6 Timeout to ensure user-switching dialog is closed 
In the event of user-switch invoked by a remote device admin call,
the window manager does not make window-shown callbacks when the
screen is off. Add a timeout to continue the user switch in case
the callback doesn't come through.

This fixes a stuck "Switching to user.." dialog when a profile
owner requests a user wipe.

Bug: 19275716
Change-Id: I3a51bbaaf3d9ac6c006464360f1146b2499d205b
 2015-02-10 12:15:22 -08:00
Chris Warrington
4308c2aea4 am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
automerge: 4499888

* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:14:44 +00:00
Luan Nguyen
5ed11d837f am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs automerge: 6ee9018 
automerge: c6ec799

* commit 'c6ec79913fbcf5b915ed55f3cc7b49690ee997f9':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 20:10:56 +00:00
Shanea King-Roberson
24513bc580 am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '3162289445ebade804c422162578d328c4762372':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:10:38 +00:00
Eric Gilmore
077b27bfda am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 automerge: 2b7f0cf 
automerge: ac4dfec

* commit 'ac4dfec8b3e15405fc0b0eba581169e7feef28ff':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 20:09:08 +00:00
Shanea King-Roberson
3162289445 am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:04:17 +00:00
Chris Warrington
449988872b am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
* commit '510c24e8930447811f6725cbf7f3cefec2194a5d':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:01:00 +00:00
Shanea King-Roberson
c86ac21f73 Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 2015-02-10 19:57:30 +00:00
Chris Warrington
510c24e893 Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 2015-02-10 19:56:32 +00:00
Soonil Nagarkar
9e9345c70a Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related." 2015-02-10 19:20:36 +00:00
Luan Nguyen
c6ec79913f am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
automerge: 6ee9018

* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:18:37 +00:00
Eric Gilmore
ac4dfec8b3 am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
automerge: 2b7f0cf

* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 19:16:49 +00:00
John Spurlock
60c08aceea Doze: pulse less often. automerge: 618e420 automerge: 43c7741 
automerge: 90fc289

* commit '90fc289102465e7c267d3f19f7e3e5c56beb5fc0':
  Doze: pulse less often.
 2015-02-10 19:06:05 +00:00
Luan Nguyen
6ee90183ab am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '18fc7b85543cd21317475962521606038cd44383':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:02:50 +00:00
Luan Nguyen
18fc7b8554 am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:56:32 +00:00
Luan Nguyen
ba795593e5 am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '9b432bbece3cca6316b2638a947983e21c65917f':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:47:38 +00:00
Luan Nguyen
9b432bbece am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:40:34 +00:00
Soonil Nagarkar
0e8fd09708 Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related. 
Make Intent.ACTION_QUERY_PACKAGE_RESTART and Intent.EXTRA_PACKAGES
accessible from GmsCore so that location and context components can
properly respond to the broadcast.

BUG: 19298558
Change-Id: I4b5cf4991c69d3aa745d03271187c65794df10b2
 2015-02-10 10:37:36 -08:00
Wale Ogunwale
00c5e4e190 Merge "Set TaskStack config orientation based on dimensions" 2015-02-10 18:35:12 +00:00
Luan Nguyen
e49fbfa21c Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e Adding videos for 5.0 changes and watch face development. 
On branch pilot-videos
 Changes to be committed:
	modified:   docs/html/about/versions/android-5.0-changes.jd
	modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
 2015-02-10 10:29:36 -08:00
Wale Ogunwale
a928127a74 Set TaskStack config orientation based on dimensions 
The TaskStack override configuration is set based on the
stack dimensions so we can load the most acturate resources
for activities in the stack in a multi-window environment.

Also, disabled fixed screen orientation for resizeable
activities.

Bug: 19305402
Change-Id: I7b182554523b12f2ef77f8bbc7b16891231125bf
 2015-02-10 10:16:39 -08:00
Eric Gilmore
2b7f0cff1e am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit 'f35e815939d60863ec84fdd906d96279b652e33c':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:12:47 +00:00
Eric Gilmore
f35e815939 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
automerge: 2b36779

* commit '2b36779f30a511cc4439a519c95963280a779fdc':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:05:23 +00:00
Eric Gilmore
2b36779f30 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:56:51 +00:00
Chris Craik
ee2d6ecdaf Merge "Fix Glop vertex alpha blending" 2015-02-10 17:46:19 +00:00
Eric Gilmore
99b91b2fd2 am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:45:47 +00:00
John Spurlock
90fc289102 Doze: pulse less often. automerge: 618e420 
automerge: 43c7741

* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:33 +00:00
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
John Spurlock
43c7741c28 Doze: pulse less often. 
automerge: 618e420

* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
  Doze: pulse less often.
 2015-02-10 17:32:27 +00:00
Kenny Guy
8925696e14 Merge "Fix issue with ignoring dpm policy for first call." 2015-02-10 17:14:35 +00:00
Kenny Guy
b0d3ab2ce9 Fix issue with ignoring dpm policy for first call. 
Fix the fact that the first call to
userAllowsPrivateNotificationsInPublic ignores flags
set by the dpm.

Change-Id: Ib6f33edc00f822eb45d13ba2366ddb2c68179e73
 2015-02-10 17:02:00 +00: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
d1e074a724 am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." 
* commit 'fd523efcde98e97cd8c088f95198e6e13f4f8b64':
  Get the instruction set that the libraries of secondary Abi is supported.
 2015-02-10 16:18:27 +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
Jason Monk
407f8da49d Merge "Fix crash in Wifi QS Panel" 2015-02-10 15:01:19 +00:00
John Spurlock
618e420adf Doze: pulse less often. 
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.

Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
 2015-02-10 09:23:29 -05:00
Jason Monk
6572eae9d2 Fix crash in Wifi QS Panel 
When open QS wifi panel while wifi was off was causing a crash from
wifi enabling while the WifiTracker was not in a scanning state.
Fix plus a test enclosed.

Bug: 19322090
Change-Id: Id863cdcbf4aa8d50822de3a200355dbaee74b488
 2015-02-10 13:58:40 +00:00
Jorim Jaggi
b10e33ff80 Split up android.policy into framework.jar and services.jar 1/3 
Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
 2015-02-10 14:56:02 +01:00
Robin Lee
85bd63f461 DevicePolicy: clarify wipeData docstring 
Wiping secondary users or profiles does not cause a reboot.

Bug: 19294240
Change-Id: I59179b6d19061067326ea8ef1a730cc21f52ea53
 2015-02-10 11:51:00 +00:00