Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,909 Commits 3 Branches 0 Tags
fa58f454c177e35f774dec3d2987628fa6359239
Commit Graph

48888 Commits

Author SHA1 Message Date
Nicolas Prévot
fa58f454c1 am 6478b4f1: Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd automerge: e5d3ee8 
* commit '6478b4f19a527b0ca26485aaac477e4d4c83a5d5':
  Clarify docs for user restrictions
 2015-01-13 20:33:24 +00:00
Craig Mautner
91934a3b2f am 19c549fc: am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '19c549fc735bf8a1df5cccb6cc0cdf46c7d242a4':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 20:33:08 +00:00
Alan Viverette
cb4a489fd1 am 4ecb5fb2: am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '4ecb5fb288fd9994e7b2ec0091fbbcdc81f69526':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 20:33:02 +00:00
Wale Ogunwale
3c0e7e908f am 00c85656: am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '00c8565614d3555e723ff3d8dad3af92d69d81ea':
  Don't allow windows with invalid types to be added.
 2015-01-13 20:32:07 +00:00
Olawale Ogunwale
be37df395e am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
automerge: 0f8ecc8

* commit '0f8ecc84c8b86054bfd3275f942c3a705df01fbb':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-13 20:19:57 +00:00
Nicolas Prévot
6478b4f19a Merge "Clarify docs for user restrictions" into lmp-mr1-dev automerge: 6ab76bd 
automerge: e5d3ee8

* commit 'e5d3ee8e4fae72ef554a0e1084e88aea9ed8f020':
  Clarify docs for user restrictions
 2015-01-13 17:44:21 +00:00
Nicolas Prévot
e5d3ee8e4f Merge "Clarify docs for user restrictions" into lmp-mr1-dev 
automerge: 6ab76bd

* commit '6ab76bd434d587fecefd5801905b09bcd32b1661':
  Clarify docs for user restrictions
 2015-01-13 17:39:34 +00:00
Nicolas Prévot
6ab76bd434 Merge "Clarify docs for user restrictions" into lmp-mr1-dev 2015-01-13 17:35:14 +00:00
Amith Yamasani
150514bd03 Clarify docs for user restrictions 
Specify which restrictions are not relevant or behave differently
for managed profiles.

Bug: 18768578
Change-Id: Iac1435c5b931cbb889902a9b9e427bc0e0778bf2
 2015-01-13 16:04:42 +00:00
Craig Mautner
19c549fc73 am 1e263d3f: am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full." 
* commit '1e263d3f140e90966790875a815f23c92550f2f2':
  Prevent system server dump stuck by pipe buffer full.
 2015-01-13 04:20:23 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Alan Viverette
4ecb5fb288 am 82bdfcfa: Update docs for Window.setElevation(), apply changes immediately automerge: 71922de 
* commit '82bdfcfadc17b8467a0e3c50843997e7957a9452':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:24:11 +00:00
Alan Viverette
82bdfcfadc Update docs for Window.setElevation(), apply changes immediately 
automerge: 71922de

* commit '71922de6c8e407ff24bb1a500cb53bb1a647c758':
  Update docs for Window.setElevation(), apply changes immediately
 2015-01-13 02:16:32 +00:00
Alan Viverette
71922de6c8 Update docs for Window.setElevation(), apply changes immediately 
BUG: 18983689
Change-Id: I471104092d6296dc0ba2689da96783be088fbce8
 2015-01-12 16:14:02 -08:00
Wale Ogunwale
00c8565614 am 42b0d10a: am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '42b0d10a83dae285a3d3af9911aa35a90db203d0':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:22:05 +00:00
Wale Ogunwale
42b0d10a83 am 1ea6afe1: Merge "Don\'t allow windows with invalid types to be added." into lmp-mr1-dev 
* commit '1ea6afe1234b04de0f5b3f9ac5802b1c6d42e8ac':
  Don't allow windows with invalid types to be added.
 2015-01-12 22:15:58 +00:00
Wale Ogunwale
74bf065e43 Don't allow windows with invalid types to be added. 
Bug: 18950225
Change-Id: Ia7ead72d036c7628e0a97f8fe9fef2a35525e4df
 2015-01-12 14:01:25 -08:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +00:00
Paul McLean
96798efe99 Merge "Support for simultaneous USB Audio Devices connect/disconnect" 2015-01-09 23:12:37 +00:00
Paul McLean
0a8f06922f Support for simultaneous USB Audio Devices connect/disconnect 
Attach/Detach logic
Decoupling card# and list index
Modern loop constructs
Consistent logging flags
Add class/type flags to device "address" string.
Factored UsbAudioDevice out of UsbAudioManager.

Bug: 18399845
Bug: 18717784

Change-Id: I6f185e1c24091d4c0d21eb7e922a1496748d32c3
 2015-01-09 14:56:43 -08:00
Jeff Sharkey
df38a17020 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev automerge: 0cb736f 
automerge: d6a8c32

* commit 'd6a8c32a6a2ac07f25f65622366ccb4ccffbdcdd':
  Guard against MountService throwing NPE.
 2015-01-09 19:29:24 +00:00
Jeff Sharkey
d6a8c32a6a am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
automerge: 0cb736f

* commit '0cb736f754d8f487ebe4c8cc670e5dd2589eaea1':
  Guard against MountService throwing NPE.
 2015-01-09 19:24:31 +00:00
Dianne Hackborn
1ed82edf1d am 2abf1f1c: Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e automerge: a319aa8 
* commit '2abf1f1c212574ea7073584406ee86898f5d3779':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:21:25 +00:00
Jeff Sharkey
0cb736f754 am 2b46774f: Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 
* commit '2b46774ff950270365238e12e4a336e2004500e2':
  Guard against MountService throwing NPE.
 2015-01-09 19:21:24 +00:00
Jeff Sharkey
2b46774ff9 Merge "Guard against MountService throwing NPE." into lmp-mr1-dev 2015-01-09 19:14:29 +00:00
Dianne Hackborn
2abf1f1c21 Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev automerge: 54f9b1e 
automerge: a319aa8

* commit 'a319aa800df36d40e1de453b64fd1e14573e6d80':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:13:58 +00:00
Dianne Hackborn
a319aa800d Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 
automerge: 54f9b1e

* commit '54f9b1eedc86a3066bedf3d8ea3e8ffbb83cb678':
  Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi
 2015-01-09 19:11:44 +00:00
Dianne Hackborn
54f9b1eedc Merge "Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi" into lmp-mr1-dev 2015-01-09 19:08:50 +00:00
Chet Haase
5058c38a31 Add backgroundColor getter to View 
Change-Id: I3a75169a2e91ec712fb1db4d130089a1261fc66b
 2015-01-09 10:00:22 -08:00
Dianne Hackborn
b3d4cb369e Fix issue #18942959: Phone getting stuck then restarts after unplugging from Audi 
FastPrintWriter needs to have its own lock for each instance, or
else one getting blocked can cause others to block and whacky deadlocks
result.

Also:

- Improve error reporting of SystemConfig to tell you which config
  file is the problem.
- Fix CoreSettingsProvider to not spew errors if a setting is not
  defined (it should just use a default value).
- Get rid of noisy init output of ConditionProviders.
- Reduce log noise of starting a process; move some of that information
  to ProcessRecord to print on demand.

Change-Id: I1032d141ddd449968b74ab7b88ab36f2d228ad1a
 2015-01-09 09:54:06 -08:00
Brian Attwell
cc4b2f731e Ubundle from contacts contract Part 1/3 
1. Remove Intents.UI
2. Expose Authority
3. Expose ProviderStatus

Discussion: go/contacts-contact-intent-ui

Bug: 18777272
Change-Id: I9c6125cc30710e4637b38f3785608abb9928d1a2
 2015-01-09 01:07:45 +00:00
Mathieu Chartier
c2c2e26fd4 Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e automerge: 117ba18 
automerge: eb896e1

* commit 'eb896e1febd57eba541b8760bcd7010457598b85':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:40:23 +00:00
Mathieu Chartier
eb896e1feb Merge "Call VMRuntime.clampGrowthLimit for small heap apps" automerge: 9a6c45e 
automerge: 117ba18

* commit '117ba186d1d28ae7eb6d1187c795e502668fa9b4':
  Call VMRuntime.clampGrowthLimit for small heap apps
 2015-01-09 00:28:33 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17:16 +00:00
Alan Viverette
4e5168fae4 Update year picker to use activation colors 
Change-Id: I148b592538e1e4a928bd7ebb99a3083b760b839d
 2015-01-08 15:25:30 -08:00
Mathieu Chartier
24cee07160 Call VMRuntime.clampGrowthLimit for small heap apps 
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.

Bug: 18387825
Bug: 17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
 2015-01-08 14:42:20 -08:00
Jeff Sharkey
9708669b2f Guard against MountService throwing NPE. 
Fall through to below logic and return null instead of crashing the
entire app.  We already tell developers the value may be null.

Bug: 17781998
Change-Id: I05dce90ae6bc547d74f8c16d30b3dc7888a937fe
 2015-01-08 14:00:15 -08:00
Dianne Hackborn
adf1c93ff7 am 3968820f: am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev automerge: 16e4324 
* commit '3968820fc75e1eac03e54cba45b5a0adc28ee87d':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:55:28 +00:00
Dianne Hackborn
3968820fc7 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
automerge: 16e4324

* commit '16e4324dd967d180f77fb25dbeea77229eaf0511':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:48:34 +00:00
Dianne Hackborn
16e4324dd9 am cb8d8e10: Merge "Fix issue #18827122: system server crashed on broadcasting..." into lmp-mr1-dev 
* commit 'cb8d8e10b0c1163914aca85f8e3b73a0cac86fb4':
  Fix issue #18827122: system server crashed on broadcasting...
 2015-01-08 21:46:53 +00:00
Alan Viverette
5dc973cb03 Use text ascent / descent to center SimpleMonthView labels 
Also updates Canvas.drawText() docs to clarify that the y-origin is
actually the baseline rather than the top (which is what developers
expect).

BUG: 18864682
Change-Id: Ibfa2a79327d17b5135f90468195fbeca922a25c8
 2015-01-08 11:12:39 -08:00
Dianne Hackborn
29cd7f1962 Fix issue #18827122: system server crashed on broadcasting... 
...an intent with invalid or null package uri

Also tweak battery stats to record in the history when we shut
down, to understand when restarts are due to clean shutdowns or
crashes.

Change-Id: I6443dafc23e356be9f569906f6081152d4f92d2b
 2015-01-08 10:58:45 -08:00
Marcin Kosiba
3e853fb1d2 Un-break the WebView build. 
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.

Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
 2015-01-08 12:45:40 +00:00
Jeff Sharkey
6fe380724b am bcba2182: Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 automerge: 387da77 
* commit 'bcba21827c836e8941719b432fbf11d1bb8e8639':
  check ntpserver as empty string instead of null
 2015-01-08 01:11:05 +00:00
Jeff Sharkey
bcba21827c Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 
automerge: 387da77

* commit '387da7769757ab6368acb2a0000cd8a85d3e55d8':
  check ntpserver as empty string instead of null
 2015-01-08 01:03:49 +00:00
Jeff Sharkey
dbcb4a16d4 Merge "check ntpserver as empty string instead of null" 2015-01-08 00:57:43 +00:00
Alan Viverette
4456b81f22 Merge "Add popup window accessors for anchor overlap, gravity, window" 2015-01-08 00:37:17 +00:00
Young-Ho Cha
0eda7dfcac check ntpserver as empty string instead of null 
mServer cannot set null, because string from resource always returns
non-null charsequence

Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
 2015-01-08 09:34:01 +09:00
Alan Viverette
b97d69856d API for tinting TextView compound drawables 
BUG: 18762354
Change-Id: Iba6fab4f63a5d26cb27606d25a1fd0a1f47afa57
 2015-01-07 16:16:20 -08:00