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

175280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
5228d0832a am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0c3282b5d2f491bfb0ca6b5cda62864d0b42bba7':
  docs: Update auto landing and design page image assets
 2015-03-11 17:42:58 +00:00
Rich Slogar
40055c220f am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '11558e5d2259a48604f494c540df72de34977ce5':
  docs: eclipse revisions update
 2015-03-11 17:42:54 +00:00
Andrew Solovay
e5fd6c76a4 am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '3d950de4d4028e0c7763932c00c372d41c832e87':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:42:50 +00:00
Luan Nguyen
0c3282b5d2 am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '50a9b83554decb4913fc8eac9862edf902149265':
  docs: Update auto landing and design page image assets
 2015-03-11 17:32:01 +00:00
Rich Slogar
11558e5d22 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update
 2015-03-11 17:31:57 +00:00
Andrew Solovay
3d950de4d4 am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:31:53 +00:00
Prashant Malani
276d1bc929 am a98c21a6: Make circular mask thickness configurable 
* commit 'a98c21a662040a8afa75a35bd882c292f7ed8414':
  Make circular mask thickness configurable
 2015-03-11 17:24:54 +00:00
Justin Koh
e011eb4ff9 am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev 
* commit 'dff0fdb4172a230e4faff7ed93842c21a2d57335':
  Add translatable=false to dozeComponent
 2015-03-11 17:23:34 +00:00
Luan Nguyen
50a9b83554 am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '42ee70aac023da26a6dc4dee5856871372e792e8':
  docs: Update auto landing and design page image assets
 2015-03-11 17:18:43 +00:00
Rich Slogar
8ab872dba1 am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update
 2015-03-11 17:18:39 +00:00
Andrew Solovay
a493c48989 am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-11 17:18:23 +00:00
Marco Nelissen
926ebb860a Fix context leak 
Using an activity context with AudioManager could cause that context
to be held on to longer than desired, for example if the caller
acquired audio focus but never abandoned it. Fix acquire/abandon in
VideoView, and use the application context in AudioManager to mitigate
the issue for other misbehaving code.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
 2015-03-11 10:00:28 -07:00
Luan Nguyen
ca0db1a0ec am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit 'eeb79d104fc09ea727108bde7a7ef06f3300241a':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:42:52 +00:00
Luan Nguyen
eeb79d104f am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 
* commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
  Revert "docs: Update auto landing and design page image assets"
 2015-03-11 16:35:32 +00:00
Luan Nguyen
9a7238d8f5 Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 2015-03-11 16:25:33 +00:00
Luan Nguyen
36b8a59a6d Revert "docs: Update auto landing and design page image assets" 
This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
 2015-03-11 16:20:52 +00:00
Craig Mautner
20553036af am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task" 
* commit '686947801e7c35eb60bf25385f46e45db66bee69':
  [ActivityManager] Fix index OOB when resetting removed task
 2015-03-11 13:59:04 +00:00
Craig Mautner
686947801e Merge "[ActivityManager] Fix index OOB when resetting removed task" 2015-03-11 13:46:38 +00:00
riddle_hsu
1d7919a7eb [ActivityManager] Fix index OOB when resetting removed task 
Assume task T has an activity X lives in process P.
When P is died and before death recipient being called,
start activity with flag RESET_TASK_IF_NEEDED to bring the
existed task T.

Then scheduleResumeActivity IPC will fail and trigger start
a new process that removes task T.

That results resetTaskIfNeededLocked cannot find the task
when continuing the start flow.

Detail:
https://code.google.com/p/android/issues/detail?id=159558

Change-Id: Icc400c7a6c481a3f78657e9fb83cf0c3a17dde68
 2015-03-11 17:09:50 +08:00
Deepanshu Gupta
7b2cae5072 Fix project settings. 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
 2015-03-10 18:16:21 -07:00
Deepanshu Gupta
d345f44a87 Add RecyclerView support. 
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
 2015-03-10 18:16:21 -07:00
Prashant Malani
a98c21a662 Make circular mask thickness configurable 
Obtain the circular mask thickness as a dimension so that it can
be customized per-device.

Change-Id: Ied88f91424c5cf4f25dd1e78cf22f0fd7ea7b0a4
Signed-off-by: Prashant Malani <pmalani@google.com>
 2015-03-11 00:34:15 +00:00
Justin Koh
dff0fdb417 Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev 2015-03-10 20:37:06 +00:00
Justin Koh
ba6cff0de7 Add translatable=false to dozeComponent 
Add translatable=false to dozeComponent: this prevents it from breaking with
en_XA pseudolocalization.

Change-Id: I53a77d8590c65189633b89fed67d247115e75df9
 2015-03-10 13:12:51 -07:00
Luan Nguyen
42ee70aac0 am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
  docs: Update auto landing and design page image assets
 2015-03-10 19:28:57 +00:00
Rich Slogar
dcc5a34b14 am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update
 2015-03-10 19:28:53 +00:00
Luan Nguyen
24b4e5729e am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs 
* commit '0fc17c37a514a80073631dffa381ec07caed93cf':
  docs: Update auto landing and design page image assets
 2015-03-10 19:22:37 +00:00
Rich Slogar
08ddf132bf am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs 
* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update
 2015-03-10 19:22:33 +00:00
Luan Nguyen
0fc17c37a5 Merge "docs: Update auto landing and design page image assets" into lmp-docs 2015-03-10 19:18:54 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00
Rich Slogar
05298d0fd5 docs: eclipse revisions update 
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
 2015-03-10 11:46:49 -07:00
Dimitry Ivanov
3b9cfe30ed am a6ed1b95: am 6e116429: Merge "Generate gnu hash for arm only" 
* commit 'a6ed1b9547dcd592031a415739cc7e672c068f7c':
  Generate gnu hash for arm only
 2015-03-10 17:21:32 +00:00
Dimitry Ivanov
a6ed1b9547 am 6e116429: Merge "Generate gnu hash for arm only" 
* commit '6e116429a8d48f9c8298f15c332cd29146694d8b':
  Generate gnu hash for arm only
 2015-03-10 17:14:53 +00:00
Dimitry Ivanov
6e116429a8 Merge "Generate gnu hash for arm only" 2015-03-10 17:07:58 +00:00
Goran Jakovljevic
12f4749df8 Generate gnu hash for arm only 
Fixes build failure caused by:
https://android-review.googlesource.com/#/c/139670/

As previously discussed [1], MIPS does not support GNU-style ELF hashes.

[1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk

Change-Id: I8edb8a1595308db2ecd1bd6650a069b1224ae64f
 2015-03-10 09:50:51 -07:00
Mark Renouf
91239a0b73 am cc2212d2: Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev 
* commit 'cc2212d2eea86e733955bdeda36cb7e4afe2bb6a':
  Adds system property for developer option for force-enable burn-in protection
 2015-03-10 16:45:06 +00:00
Mark Renouf
cc2212d2ee Merge "Adds system property for developer option for force-enable burn-in protection" into lmp-mr1-modular-dev 2015-03-10 16:38:54 +00:00
Rich Slogar
e7b3834e23 am 1d0b0edd: am ccc24997: am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit '1d0b0edd303a0a6b15ec74f8036bd0e2e88be692':
  docs: build tools revision 22.0.0:
 2015-03-10 15:52:52 +00:00
Narayan Kamath
debf5a09e4 am c2826fb9: am 3d333c74: Merge "Fix typos in AudioManager javadoc" 
* commit 'c2826fb922ba1626920907fa892cbc98e0db64a6':
  Fix typos in AudioManager javadoc
 2015-03-10 15:27:58 +00:00
Dmitriy Ivanov
1944667b7f am 8ced0357: am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics" 
* commit '8ced0357152a9df64c9e21c8f3cec69cc7e8403d':
  Generate sysv hash for libjnigraphics
 2015-03-10 15:27:51 +00:00
Narayan Kamath
c2826fb922 am 3d333c74: Merge "Fix typos in AudioManager javadoc" 
* commit '3d333c745f928ca1595aca111d9938fa3cf3e282':
  Fix typos in AudioManager javadoc
 2015-03-10 15:23:06 +00:00
Dmitriy Ivanov
8ced035715 am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics" 
* commit '2a88ff2fe1849a3823962a2c239afdf6339fedc9':
  Generate sysv hash for libjnigraphics
 2015-03-10 15:12:46 +00:00
Andreas Gampe
b6d6c04a71 am 174a4488: am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd" 
* commit '174a44888ec56f688426c80d50b9e0021f47c16f':
  Frameworks/base: Pass APK debugability to installd
 2015-03-10 15:11:56 +00:00
Andrew Solovay
5f8e08ed2c am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto" 
* commit '66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
  docs: Revisions to "Providing Messaging for Auto"
 2015-03-10 15:11:01 +00:00
Narayan Kamath
3d333c745f Merge "Fix typos in AudioManager javadoc" 2015-03-10 15:10:15 +00:00
Eemi Haukkala
bc68256fea Fix typos in AudioManager javadoc 
The ACTION_HDMI_AUDIO_PLUG constant's description
had spelled "HDMI" as "HMDI" and was missing a
period. Fixes issue 93726.

Change-Id: Idfd5352dba022afcd81bc9e50864fc6e95c661db
Signed-off-by: Eemi Haukkala <eemi.haukkala@gmail.com>
 2015-03-10 15:10:05 +00:00
Rich Slogar
1d0b0edd30 am ccc24997: am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 
* commit 'ccc24997a37a7ee96b80f4dc4f43ea52d2c2cd46':
  docs: build tools revision 22.0.0:
 2015-03-10 15:08:58 +00:00
Dmitriy Ivanov
2a88ff2fe1 Merge "Generate sysv hash for libjnigraphics" 2015-03-10 04:41:35 +00:00
Dmitriy Ivanov
1dc91a5f7a Generate sysv hash for libjnigraphics 
Bug: 19059885
Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
 2015-03-09 19:42:16 -07:00
Andreas Gampe
174a44888e am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd" 
* commit '7f383873566024c7121cadae3bbdd2a7c47150bc':
  Frameworks/base: Pass APK debugability to installd
 2015-03-10 02:10:22 +00:00