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

157737 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick
ec1aa9f38e am 04e50c47: am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit '04e50c474ce5b6aa2e366bc057a29a16467a66bd':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 22:36:57 +00:00
Ihab Awad
c7d8e8bd5f am 24199873: Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 
* commit '24199873ca3297555909914f92e3cab97169b057':
  Refine implementation of GSM conferences (1/3)
 2014-10-01 22:36:52 +00:00
Craig Mautner
6f357112f8 am 245645ca: Merge "Don\'t clear visible-behind activity if it is top" into lmp-dev 
* commit '245645ca460150b4030d84c88faa931345a90a50':
  Don't clear visible-behind activity if it is top
 2014-10-01 22:36:47 +00:00
Selim Cinek
9262cd1498 am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '15b2202bacdfcc249d7f51bcd3361e6694d24267':
  Adapting translation length for a string in a dialog
 2014-10-01 22:36:07 +00:00
Baligh Uddin
b159658657 am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'ff99ff98cc1ab526c585992b8d1b48128677b192':
  Import translations. DO NOT MERGE
 2014-10-01 22:36:04 +00:00
John Spurlock
8994f2eb44 am c909e1b2: Zen: Fix new event category check. 
* commit 'c909e1b2dfa2e47b786d96818f70f6308c5a78be':
  Zen: Fix new event category check.
 2014-10-01 22:35:59 +00:00
Narayan Kamath
1ff5abdbb1 am 7dc7f676: Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 
* commit '7dc7f676d699c739128dcc7855cbc0dacddaaa57':
  Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS
 2014-10-01 22:35:50 +00:00
Baligh Uddin
115225a694 am 42d0c353: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '42d0c353ffbd4aa506025a60806348dd07d4082f':
  Import translations. DO NOT MERGE
 2014-10-01 22:35:15 +00:00
Brian Carlstrom
753f08f740 am 7123bd69: Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 
* commit '7123bd690fa14d0b9e33f5a70c58ea5b5f1b7d32':
  Use VMRuntime.isBootClassPathOnDisk
 2014-10-01 22:35:11 +00:00
Ricardo Cervera
d791d332b5 am 1ed09f9b: am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '1ed09f9b5bd7073f1a574499461dfbd47669da09':
  docs: ADT beginner text fix
 2014-10-01 22:34:53 +00:00
Jeff Brown
c75d2ce970 am 62434d6a: Merge "Reduce latency from doze to screen on." into lmp-dev 
* commit '62434d6a4b4b5aa7d44aa4344b5cb0f82df2b923':
  Reduce latency from doze to screen on.
 2014-10-01 22:34:44 +00:00
Sungsoo Lim
fc6581d718 am ee33c661: Merge "Update java doc for content rating systems" into lmp-dev 
* commit 'ee33c661ef7055213a8e3d6d02240aab77a82756':
  Update java doc for content rating systems
 2014-10-01 22:34:34 +00:00
Jerome Poichet
8be1828ae9 am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev 
* commit '72079f7f9b644e57169e26597ec7c727786071a1':
  Make sure cancel is called on tear down.
 2014-10-01 22:34:24 +00:00
Wink Saville
d1ac9bd2bd Merge commit '62321ab1' into fix-merge-conflict-lmp-dev-plus-aosp 
* commit '62321ab1':
  Maybe fix issue #17700474: manta: high occurrence of device booted...

Conflicts:
	services/core/java/com/android/server/am/ActivityManagerService.java

Change-Id: I7d472115d83a3dde326f991c245b2c6fed29e00c
 2014-10-01 15:29:55 -07:00
Dan Albert
864272f3eb resolved conflicts for merge of fe50cfd5 to lmp-dev-plus-aosp 
Change-Id: Iea93ad20b44f0183f1868f078dd7982b2798fcd3
 2014-10-01 13:47:12 -07:00
Dan Albert
fe50cfd533 am c46dbe8a: Merge "Use std::sort instead of qsort_r wrapper." 
* commit 'c46dbe8ac4748a0084b026524ad9e5ac44fb9fde':
  Use std::sort instead of qsort_r wrapper.
 2014-10-01 20:34:15 +00:00
Dan Albert
c46dbe8ac4 Merge "Use std::sort instead of qsort_r wrapper." 2014-10-01 20:30:52 +00:00
Dan Albert
0de19adc80 Use std::sort instead of qsort_r wrapper. 
The HAVE_(BSD|GNU)_QSORT_R in AndroidConfig.h has never worked, and we
should just be using something standard anyway.

Change-Id: I784d6212f6c890a11c4af2f83d1ce2d279708652
 2014-10-01 11:34:17 -07:00
kmccormick
04e50c474c am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:55:43 +00:00
Ihab Awad
24199873ca Merge "Refine implementation of GSM conferences (1/3)" into lmp-dev 2014-10-01 17:50:49 +00:00
Craig Mautner
245645ca46 Merge "Don't clear visible-behind activity if it is top" into lmp-dev 2014-10-01 17:48:14 +00:00
kmccormick
d1ba4c13d0 am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'ae3bd63bc5ef8106a0d1c2ac15d872517bded5c3':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:25:38 +00:00
Craig Mautner
64ccb70867 Don't clear visible-behind activity if it is top 
Previously if an activity requested to keep running behind
translucent activities (Activity.requestVisibleBehind()) and then
converted itself to opaque (Activity.convertFromTranslucent()), we
would clear the visible-behind activity. This change tests to see
if the top activity is the visible-behind activity and does not
clear it in that case.

This change also clears the visible-behind activity whenever it
comes back to the front. That forces the activity to call
requestVisibleBehind() each time it is resumed.

Fixes bug 17648436.

Change-Id: Id0fc4d7e2a2b907675305d98bad1b08cb610919e
 2014-10-01 10:14:53 -07:00
kmccormick
ae3bd63bc5 am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 
* commit 'a1572ffc6b8df1f0da637fdb93b949322fcb3637':
  Doc update: Update preprod (staging) instructions.
 2014-10-01 17:08:13 +00:00
kmccormick
a1572ffc6b Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs 2014-10-01 17:02:26 +00:00
Selim Cinek
15b2202bac Merge "Adapting translation length for a string in a dialog" into lmp-dev 2014-10-01 16:43:07 +00:00
Baligh Uddin
ff99ff98cc Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 16:35:13 +00:00
John Spurlock
c909e1b2df Zen: Fix new event category check. 
Allow events through if configured, and use a switch
for separating mode-specific logic.

Bug:17580878
Change-Id: Id7b5d8b50173015d6a78568ed0a90e0bccf98549
 2014-10-01 11:17:43 -04:00
Selim Cinek
1aca1d4110 Adapting translation length for a string in a dialog 
Bug: 17344905
Change-Id: Id95bdfea30c8ffd86a44cfa259cf5417abb09528
 2014-10-01 14:12:11 +02:00
Narayan Kamath
7dc7f676d6 Merge "Set Build.CPU_ABI{2} from SUPPORTED_{32,64}_BIT_ABIS" into lmp-dev 2014-10-01 09:53:34 +00:00
Baligh Uddin
42d0c353ff Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 04:25:43 +00:00
Brian Carlstrom
7123bd690f Merge "Use VMRuntime.isBootClassPathOnDisk" into lmp-dev 2014-10-01 04:21:26 +00:00
Ricardo Cervera
1ed09f9b5b am e906b38b: am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'e906b38b7e692d05cf57ce12aabcb103a9a8b775':
  docs: ADT beginner text fix
 2014-10-01 03:15:45 +00:00
Ricardo Cervera
e906b38b7e am 781c988a: am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit '781c988a767eabf9b1b03b4a74f21e3b687902b6':
  docs: ADT beginner text fix
 2014-10-01 03:08:30 +00:00
Ricardo Cervera
781c988a76 am ae7b5dc4: Merge "docs: ADT beginner text fix" into klp-modular-docs 
* commit 'ae7b5dc49381e76c82cda928cc37a6a8b529da25':
  docs: ADT beginner text fix
 2014-10-01 02:57:29 +00:00
Jeff Brown
62434d6a4b Merge "Reduce latency from doze to screen on." into lmp-dev 2014-10-01 02:31:30 +00:00
Ricardo Cervera
ae7b5dc493 Merge "docs: ADT beginner text fix" into klp-modular-docs 2014-10-01 02:07:15 +00:00
Sungsoo Lim
ee33c661ef Merge "Update java doc for content rating systems" into lmp-dev 2014-10-01 01:46:26 +00:00
Jerome Poichet
72079f7f9b Merge "Make sure cancel is called on tear down." into lmp-dev 2014-10-01 01:22:42 +00:00
Dianne Hackborn
62321ab114 Merge "Maybe fix issue #17700474: manta: high occurrence of device booted..." into lmp-dev 2014-10-01 01:16:15 +00:00
Dianne Hackborn
7622a0f8e4 Maybe fix issue #17700474: manta: high occurrence of device booted... 
...but dev.bootcomplete flag is not set

Rework things to address a few issues I found:

- When the activity goes idle, the way we were handling finishing the
  boot there was calling finishBooting() with the lock held, but it
  shouldn't.  We now dispatch that and turning on the screen together
  in a separate message.

- Make sure we don't try to start the home activity until we have
  reached the point of the system being ready and mBooting being set.
  This ensures we don't do any work prematurely.

Change-Id: If30c1f287af73bc2164e7aadbe98022ae42cc5e7
 2014-09-30 18:05:18 -07:00
Jeff Brown
0a434776b8 Reduce latency from doze to screen on. 
Don't wait for the brightness ramp to complete before reporting
display ready.  Keep track of whether we have any unfinished
brightness changes and take care to grab a wakelock to ensure
they are eventually applied.

Ideally we would rewrite the whole state machine to more carefully
coordinate screen state and brightness changes but that's too
risky for now.

The pixel fairies are having a bad day.

Bug: 17718416

(cherry picked from commit 875f80c2732a3fbe652a6e8fc14031041f791308)

Change-Id: I7a2d8ba4591a12b773653d3dbf86c7db016f967e
 2014-09-30 18:00:40 -07:00
Jerome Poichet
c1fb6dc1a4 Make sure cancel is called on tear down. 
- Make sure cancel is called when consumer of SpeechRecognizer calls
  destroy.
- If consumer goes away, make sure to call cancel as well.

b/17584947 Pressing mic button in Music hoses audio

Change-Id: Ibe1198b37fe6167493a8694f9089d970f1eb07de
 2014-09-30 17:56:27 -07:00
Amit Mahajan
b3ad87e6b1 am 496aeb1a: Merge "Roaming blacklist" into lmp-dev 
* commit '496aeb1a6156f3c089135a7ce4fab550589eaff7':
  Roaming blacklist
 2014-10-01 00:48:50 +00:00
Adam Lesinski
d388b1fdde am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
  Fix issue with using locally defined attrs in a shared lib
 2014-10-01 00:44:31 +00:00
Amit Mahajan
496aeb1a61 Merge "Roaming blacklist" into lmp-dev 2014-10-01 00:44:03 +00:00
Sungsoo Lim
d3f17921bd Update java doc for content rating systems 
- DVB and ISDB ratings are added.
- Remove rating systems whose countries uses DVB and ISDB.
- Updated java doc for AR, AU, and BR.

Bug: 17494772
Change-Id: Ia2a63c7914148b42078decb8de1ae45baefb010d
 2014-10-01 09:41:51 +09:00
Adam Lesinski
cd8e73817d Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev 2014-10-01 00:39:57 +00:00
w19976
a902fe5fbf Roaming blacklist 
Bug: 17684236
Change-Id: I3e4a293ed8ae134d77fe3ce0c0cfa3b6012500a8
 2014-10-01 00:37:19 +00:00
Alan Viverette
6a87fb2b29 am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev 
* commit 'c2379e005d3e692d0b725c65fa842459e65ad1dc':
  Add activated text colors, update Material preference header
 2014-10-01 00:36:45 +00:00