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

179010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
bdc399299e am d3d95172: am 38c2dae5: Merge "Remove hardcoded include paths." 
* commit 'd3d95172c3645a1d7a12e540638207ae4fb69cae':
  Remove hardcoded include paths.
 2014-12-31 10:19:00 +00:00
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
Michael Wright
3979c0bf42 resolve merge conflicts of 342e903 to master. 
Change-Id: Id8404cce5c1c8e7818e5d164f93207a8c17cf7bb
 2014-12-30 12:59:10 -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
Robin Lee
290e91107c Remove deprecated upgrade path for relatedGroupId 
As per note this has been unused for upwards of 6 months and its
attribute string is no longer referenced anywhere else in Android.

Change-Id: I5f95ffa6b3d91fca203f2d030d40df3fd55b6a70
 2014-12-30 17:36:00 +00:00
Narayan Kamath
aa118f67a7 am a4c40c37: am 72d33849: Merge "Missing break in switch statement" 
automerge: 4d72e3e

* commit '4d72e3e07e23fb13d4ba7f97f4c088948fef3e64':
  Missing break in switch statement
 2014-12-30 12:32:40 +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
437d859c57 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 automerge: 8298afb 
automerge: 9ff2160

* commit '9ff2160eddf4dfbd118eb9b0656e7803603f215a':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:18:54 +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
Baligh Uddin
60a5378bf6 Merge "Import translations. DO NOT MERGE" 2014-12-29 22:56:43 +00:00
Baligh Uddin
fbfa98aaac Merge "Import translations. DO NOT MERGE" 2014-12-29 22:56:27 +00:00
Baligh Uddin
4cb74d8d08 Import translations. DO NOT MERGE 
Change-Id: I260f664c1fc1196d913cd7daeacb6a20550f057c
Auto-generated-cl: translation import
 2014-12-29 13:22:41 -08:00
Baligh Uddin
6992a0da6d Import translations. DO NOT MERGE 
Change-Id: I0bb0474b2fb440480ae9eaef1266be341acc89f4
Auto-generated-cl: translation import
 2014-12-29 12:54:36 -08:00
Glenn Kasten
cd4ac0a204 Merge "Fix build" 2014-12-29 19:08:48 +00:00
Glenn Kasten
41edd7cb86 Merge "Update API documentation for static AudioTrack" 2014-12-29 19:08:04 +00:00
Andre Eisenbach
52e7e6fe3b am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
automerge: d5e2fa0

* commit 'd5e2fa0bed602a1eb45afb41dc64a09d60e91a44':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:45:50 +00: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
Svetoslav
64e5f085a7 am 72da9ed8: am e5ea48a7: Fix a race in accessibility manager. 
automerge: 1261ee8

* commit '1261ee87a8c781c949d8fbbe4c7990963f5a3155':
  Fix a race in accessibility manager.
 2014-12-29 18:32:28 +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
df44485698 am c97d1fbb: am 5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings." 
automerge: bf0c614

* commit 'bf0c614d33673a0a037e317c8c25ad2e6c24e77d':
  Throw IllegalArgumentException on invalid hex-strings.
 2014-12-29 16:22:57 +00: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
Glenn Kasten
b5e5efbab8 Fix build 
Change-Id: I1119c37ac317d0ce86c53a6c134c664d2f1c2cb3
 2014-12-29 08:17:56 -08: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
972c24291e am be8053a2: am 5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 
automerge: 1539c26

* commit '1539c267c7f4678434361b3fac3f56abcbb19f56':
  Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
 2014-12-29 12:21:25 +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
45159937bc am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 
automerge: 1cc57ab

* commit '1cc57aba8128134f55b6d5e4f4800c51e3472828':
  Fix "pm list permissions" crash if resource string missing
 2014-12-29 11:14:51 +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
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Esteban Talavera
ea84327fa4 Merge "Remove deprecated version of setProfileOwner that takes packageName" 2014-12-29 10:55:31 +00:00
Narayan Kamath
d44222135e am 7d019394: am 712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 
automerge: 7e6ae35

* commit '7e6ae353f022426d52df77acca4d0ded58b939b5':
  Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
 2014-12-29 10:15:50 +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
Sungsoo Lim
2021082b4a Merge "Make mute/unmute work" 2014-12-29 04:52:21 +00:00