Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
177,037 Commits 3 Branches 0 Tags
813d974e33366aaeeb54e242e2767d4eeaf940dc
Commit Graph

177037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
d3d95172c3 am 38c2dae5: Merge "Remove hardcoded include paths." 
* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.
 2014-12-31 10:13:23 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00
Narayan Kamath
bc2cc2f350 Remove hardcoded include paths. 
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.

bug: 18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
 2014-12-31 10:06:51 +00:00
Deepanshu Gupta
f5b02eb7c4 resolved conflicts for a0bc2e7e to lmp-mr1-dev 
The original change wasn't properly merged into lmp-mr1-dev because of
merge conflicts. This change manually resolves the conflicts. The main
reason for the conflict was that TimePickerSpinnerDelegate was swapped
with TimePickerClockDelegate.

This change also fixes the typo in the original change which was fixed
in a subsequent change.

Original commit: 12b6d29b7b
fix for typo: cb09bc45c5

Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
 2014-12-30 14:07:29 -08:00
Rich Slogar
c48e56eefb docs: Plugin reference update 
Change-Id: I9a6cb3b904af907b6468ba07be73dd3487a15456
 2014-12-30 12:09:05 -08:00
Michael Wright
342e903000 am 95700457: am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit '95700457139803af54a5e731816cedf1c924f3a6':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:51:20 +00:00
Michael Wright
9570045713 am a33424a5: Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 
* commit 'a33424a540ea725d4b513ee713931c66e62721a2':
  Add MEDIA_PROJECTION_SERVICE to the ServiceName list.
 2014-12-30 19:45:47 +00:00
Michael Wright
a33424a540 Merge "Add MEDIA_PROJECTION_SERVICE to the ServiceName list." into lmp-mr1-dev 2014-12-30 19:40:52 +00:00
Narayan Kamath
4d72e3e07e am a4c40c37: am 72d33849: Merge "Missing break in switch statement" 
* commit 'a4c40c373477983622622186946d21802400876e':
  Missing break in switch statement
 2014-12-30 12:29:38 +00:00
Narayan Kamath
a4c40c3734 am 72d33849: Merge "Missing break in switch statement" 
* commit '72d33849fea5de45087bfa79e645fa282ce8fcef':
  Missing break in switch statement
 2014-12-30 12:20:56 +00:00
Narayan Kamath
72d33849fe Merge "Missing break in switch statement" 2014-12-30 09:43:03 +00:00
Marvin Paul
9ff2160edd Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 
automerge: 8298afb

* commit '8298afbc78f2b2c609f2e52ca3fc7c6a2cd9797e':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:15:55 +00:00
Marvin Paul
8298afbc78 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev 
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 00:53:52 +00:00
Marvin Paul
a30fdf790d Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev 2014-12-29 23:18:17 +00:00
Deepanshu Gupta
e64a5bd2fb Fix DatePicker rendering. 
1. Return AccessibilityManager service from context.
2. Don't throw an exception if no style specifited in
obtainStyledAttributes. Specifying no style is valid and it's supposed
to use the default theme in that case.

Bug: http://b.android.com/82712 and http://b.android.com/79218
Change-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79
 2014-12-29 12:29:16 -08:00
Andre Eisenbach
d5e2fa0bed am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit '1d23da911a698ee1cc0503118f661ef0609ea8e9':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:42:03 +00:00
Andre Eisenbach
1d23da911a am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:36:27 +00:00
Andre Eisenbach
d7d9cdaebb Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 2014-12-29 18:32:22 +00:00
Svetoslav
1261ee87a8 am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager. 
* commit '72da9ed8867a3b3d6a9ae829b9a0ae526c16915c':
  Fix a race in accessibility manager.
 2014-12-29 18:30:47 +00:00
Svetoslav
72da9ed886 am e5ea48a7: Fix a race in accessibility manager. 
* commit 'e5ea48a7fe295a2815bab57f2e870901ce48b312':
  Fix a race in accessibility manager.
 2014-12-29 18:23:54 +00:00
Svetoslav
e5ea48a7fe Fix a race in accessibility manager. 
The accessibility manager has APIs for clients to observe changes
in accessibility, touch exploration, and high contrast states. The
notification of the listeners has to be done with no lock held but
in an attempt to do that the code was incorrectly iterating over
the copy on write collection.

bug:18840784

Change-Id: I6803ff1657fbf6b0cc7936671d5bbdebb5cbf6bb
 2014-12-29 09:40:46 -08:00
Narayan Kamath
bf0c614d33 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
* commit 'c97d1fbbe00a91b1a67b7c526d9cf11ffec741fa':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:20:32 +00:00
Narayan Kamath
c97d1fbbe0 am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
* commit '5106dd44f9e5877aee8e70711c026e9e23783d4c':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:15:04 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Narayan Kamath
1539c267c7 am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
* commit 'be8053a23c0f0b15697176f0cd5e322b30d474e1':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:20:16 +00:00
Narayan Kamath
be8053a23c am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
* commit '5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:14:41 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Narayan Kamath
1cc57aba81 am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
* commit '1bafd01a3fc5f94e77d1c18e5a7dcdecddcaa47f':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:13:22 +00:00
Narayan Kamath
1bafd01a3f am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
* commit '44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:06:53 +00:00
Srikanth Chintala
e4ec09da0b Telephony: Initialize GsmCellLocation class members properly 
Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.

CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
 2014-12-29 11:05:22 +00:00
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Narayan Kamath
7e6ae353f0 am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
* commit '7d019394f7ca2f047e9c3d2a98b5c23b223c6689':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:12:55 +00:00
Narayan Kamath
7d019394f7 am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
* commit '712a02050e7be4479f12a81aeb23d7217b8d7a8d':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:07:13 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Craig Mautner
3551ce9d8e am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
* commit '443d1a6ae3b9550a4a1b46926b336c1a534db2f4':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:56:42 +00:00
Craig Mautner
443d1a6ae3 am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 
* commit 'cfa31a605cda26a556009ddd4eae83085e74339b':
  [ActivityManager] Reset ActivityRecord's waitingVisible
 2014-12-29 01:44:25 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
John Spurlock
bbe3087ec0 am af84e073: Merge "Audio Policy: Clear calling identity for all paths setting ringer mode." into lmp-mr1-dev 
automerge: db41690

* commit 'db416907b831010cc2854292aa7de85fd8857a77':
  Audio Policy: Clear calling identity for all paths setting ringer mode.
 2014-12-28 05:42:43 +00:00
Baligh Uddin
3ab0f694e0 am 45c6ae56: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: bedfb2f  -s ours

* commit 'bedfb2faecc4ddc83cf368d0db5c10776236a49b':
  Import translations. DO NOT MERGE
 2014-12-28 05:41:16 +00:00
Baligh Uddin
98ff0febf4 am 4acca673: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: 378939f  -s ours

* commit '378939f0580c615e21a5c9b17565b2822f326559':
  Import translations. DO NOT MERGE
 2014-12-28 05:39:56 +00:00
Baligh Uddin
b19d7ef86d Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: c5d0323  -s ours

* commit 'c5d0323c125ff5ec687286c308386f81d7e132d9':
  Import translations. DO NOT MERGE
 2014-12-28 05:38:49 +00:00
Baligh Uddin
4fa11af768 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: b0e2d4c  -s ours

* commit 'b0e2d4c7f1b4280880e28335af0cea13af6902b4':
  Import translations. DO NOT MERGE
 2014-12-28 05:37:29 +00:00
Robin Lee
b6b7d4251c am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile CAs"" into lmp-mr1-dev 
automerge: c9db16c

* commit 'c9db16c59164d865b92e4527fb479fb892c5d4bb':
  Revert "DevicePolicy: Don't warn about managed profile CAs"
 2014-12-28 05:36:20 +00:00
Baligh Uddin
4ac5f68b56 am 83a590b1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: cecabf4  -s ours

* commit 'cecabf48ae85943b9c0e5b4805299794f5f3b857':
  Import translations. DO NOT MERGE
 2014-12-28 05:35:06 +00:00
Baligh Uddin
fc9bedb4b2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: f17490f  -s ours

* commit 'f17490f5c202676c3a2e6f27c445f334509d8f59':
  Import translations. DO NOT MERGE
 2014-12-28 05:33:41 +00:00
Pavel Zhamaitsiak
73cce93c07 am b45075a7: Merge "Add configuration indicating whether TTY over VoLTE is supported." into lmp-mr1-dev 
automerge: 48fd168

* commit '48fd1688a27519b14959b1c181f1fa8178836997':
  Add configuration indicating whether TTY over VoLTE is supported.
 2014-12-28 05:32:24 +00:00
Amit Mahajan
4b2cbae9cf am d00b6067: Merge "IMS: add the api to get IMS registration information." into lmp-mr1-dev 
automerge: 4f68c0c

* commit '4f68c0c1d8811d610021d97839af303c2752eff2':
  IMS: add the api to get IMS registration information.
 2014-12-28 05:29:52 +00:00
riddle_hsu
c215a4fb2f [ActivityManager] Set appropriate relation of task to home 
All below cases should return to home but the top will be Settings.
The initial steps are
1.Launch Settings from home
2.Press home key
3.Launch activity A in task X from home

Case 1
4.A starts activity B in task Y and calls moveTaskToBack

Case 2
4.A starts activity B in task X and calls moveTaskToBack
5.B calls finish

Case 3
4.A launches activity B in task Y
5.B launches A with NEW_TASK (bring existed task)
6.A calls finish return to B
7.B calls finish

Case 4
4.A launches activity B in task X
5.B launches C in task X
6.C launches A with flag NEW_TASK and CLEAR_TOP
7.A calls finish

Solution:
Transfer return-to to next adjacent task.

Change-Id: Icdad980eec64e081d15679600da07cf4431e40d6
 2014-12-27 12:10:45 +08:00
Jinsuk Kim
0abbba9f42 am 266f2b04: am 92ae5abf: Merge "CEC: Let the caller check CEC device type" into lmp-mr1-dev 
* commit '266f2b047ebfb80a7fa72da302988fba4c902f43':
  CEC: Let the caller check CEC device type
 2014-12-26 20:30:42 +00:00
Robert Greenwalt
ce524dc683 am 33868dab: am 4dcacef5: Merge "Fix timing between bcast and net setup." into lmp-mr1-dev 
* commit '33868dab9af09d61634f1f7ab3a8c704aacd0de0':
  Fix timing between bcast and net setup.
 2014-12-26 20:30:32 +00:00