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

181975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jinsuk Kim
09cff8cf4f Merge "CEC: Define a system property to keep playback device awake" 2015-02-10 05:27:28 +00:00
Jinsuk Kim
bad839386a CEC: Define a system property to keep playback device awake 
Playback device doesn't go to suspend (standby) mode if it's
the active source. This CL makes the behavior configurable through
the system property persist.sys.hdmi.keep_awake.

Bug: 19299723
Change-Id: Icb8b593ab44429ec0520e60d19d0368982ff5667
 2015-02-10 14:14:39 +09:00
Svetoslav
d9852a9ced am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
automerge: c052b0e

* commit 'c052b0efcef4c8656a972155c6a88135f79ed808':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:33:01 +00:00
Svetoslav
c052b0efce am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'cf2c8545bd6a8888801fa8c04d263879602eeb36':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:09:20 +00:00
Svetoslav
cf2c8545bd am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:01:50 +00:00
Svetoslav
5521f39ff7 am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb Accessibiltiy: missed update to the previous patch. 
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
 2015-02-09 18:33:07 -08:00
Jason Sams
4d343c852c am 2a3cdf57: Merge "Implement array types" automerge: 6e0ad25 
automerge: ec10f83

* commit 'ec10f833b4276cef130a26d5e4d30935dcd3ef35':
  Implement array types
 2015-02-10 01:55:07 +00:00
Neil Fuller
a10cdf45db am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" automerge: 86b9cc3 
automerge: 04bd52d

* commit '04bd52d77cd489898555e6c529e7fade7f33bd6d':
  Avoid static initialization of Layout from TextUtils
 2015-02-10 01:53:21 +00:00
Elliott Hughes
36470f02ef am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." automerge: da1bd4c 
automerge: aa12224

* commit 'aa122241faf409c1c73872db8d0ab8ac89c9acad':
  Remove obsolete 'numeric_date_template'.
 2015-02-10 01:51:37 +00:00
Baligh Uddin
c66ee745dc am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
automerge: a314754

* commit 'a3147545751266f3e58fdadffc4f71e87228c420':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:49:40 +00:00
Jason Sams
ec10f833b4 am 2a3cdf57: Merge "Implement array types" 
automerge: 6e0ad25

* commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2':
  Implement array types
 2015-02-10 01:44:11 +00:00
Neil Fuller
04bd52d77c am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" 
automerge: 86b9cc3

* commit '86b9cc30099cf0836484a5231686cb1d85ebfdca':
  Avoid static initialization of Layout from TextUtils
 2015-02-10 01:42:41 +00:00
Elliott Hughes
aa122241fa am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." 
automerge: da1bd4c

* commit 'da1bd4c01abf9ec3aa5a0d9717a60935304068c4':
  Remove obsolete 'numeric_date_template'.
 2015-02-10 01:40:59 +00:00
Baligh Uddin
a314754575 am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '2083173af997419fbc2e92627fe5500f91ac7e5b':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:25:54 +00:00
Baligh Uddin
2083173af9 am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:17:42 +00:00
Yin-Chia Yeh
7021b7e370 Merge "Camera2: lens shading related HAL3.3 update" 2015-02-10 01:15:56 +00:00
Baligh Uddin
fbf9666f84 am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:07:08 +00:00
Soonil Nagarkar
0059133011 Merge "Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related."" 2015-02-10 00:58:47 +00:00
Baligh Uddin
b2ba6dfc7b Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 2015-02-10 00:57:21 +00:00
Andre Eisenbach
7518ade9f6 am cd623416: am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit 'cd623416455100f64ef3f0be7ced27ffc04938a8':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:50:06 +00:00
Soonil Nagarkar
ffcd2400aa Revert "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related." 
This reverts commit f02fee70e1d3f0281ef7fd6117f118d5c4f7187d.
 2015-02-09 16:49:48 -08:00
Andre Eisenbach
cd62341645 am 8f31fa81: am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '8f31fa81e0a79f51ceb301193a2c77ca7f619769':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:42:55 +00:00
Wale Ogunwale
b740537044 Remove ContextImpl.mOverrideConfiguration to reduce code confusion. 
It is not used.

Change-Id: Ie944df17fbc834c54604ea8ff292b6ba0f202690
 2015-02-09 16:35:10 -08:00
Andre Eisenbach
8f31fa81e0 am 3ca77ccf: am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '3ca77ccf873f12e116a66d1c1a417fe89f75af85':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:34:43 +00:00
Andre Eisenbach
3ca77ccf87 am 455502b7: Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 
* commit '455502b7501bdbc55a739083878431c3ba7ef81a':
  Add API to check if a Bluetooth connection is encrypted (1/2)
 2015-02-10 00:26:51 +00:00
Wale Ogunwale
c2607b4ece Include stack override configurations in onConfigurationChanged() call. 
Important for activities that handle configuration changes.

Change-Id: I4d1612026f293fbb99e1abc17e663f0215658ae6
 2015-02-09 16:22:04 -08:00
Andre Eisenbach
455502b750 Merge "Add API to check if a Bluetooth connection is encrypted (1/2)" into lmp-mr1-dev 2015-02-10 00:21:43 +00:00
Soonil Nagarkar
02696d5b0f Merge "Add @SystemApi annotations to ACTION_QUERY_PACKAGE_RESTART and related." 2015-02-10 00:17:26 +00:00
Wale Ogunwale
8855963194 Merge "Limit window display frame to size of containing stack" 2015-02-10 00:09:08 +00:00
Soonil Nagarkar
f02fee70e1 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: I8377db7c347068cfdd534e8f85834674f77d4cf3
 2015-02-09 16:06:08 -08:00
John Spurlock
ad680d46be Small changes to make VolumePanel more testable. 
- Put a zen call requiring status_bar_service behind
  the controller.
- Make the dialog window params overridable by subclasses.

Bug: 19260237
Change-Id: I2b75cde8a2f7efcd8ac001f181c151597bb7a978
 2015-02-09 18:39:49 -05:00
John Spurlock
0fa412cdd2 Merge "Move AudioService to services." 2015-02-09 23:34:43 +00:00
Jason Sams
6e0ad25ca8 am 2a3cdf57: Merge "Implement array types" 
* commit '2a3cdf57a47140dfa17114338f83e0bb90054ed1':
  Implement array types
 2015-02-09 23:07:36 +00:00
Jason Sams
2a3cdf57a4 Merge "Implement array types" 2015-02-09 22:58:13 +00:00
Matthew Xie
be96280fda am a96869fc: am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit 'a96869fc1323faa5989803c5235c4c28e1094a16':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:22:29 +00:00
Matthew Xie
a96869fc13 am 24c02c41: am d67aff68: am a63ba428: Merge "Separate the protection of mProxyServiceStateCallbacks from that of mService" into lmp-mr1-dev 
* commit '24c02c418673a18a287ce0820f0024f7a18ff181':
  Separate the protection of mProxyServiceStateCallbacks from that of mService
 2015-02-09 22:14:10 +00:00
John Spurlock
6156017c22 Move AudioService to services. 
...and a few dependencies. Move remaining shared items to AudioSystem.

Change-Id: Ib9623ff867678d34977337856bb0156e8cdaeeb5
 2015-02-09 17:13:38 -05:00