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

179953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
d8775100b2 Standardize notification IDs in the sysui package. 
Use the resource system to assign IDs for notifications,
so that we know there will be no collisions.

Bug: 10671709
Change-Id: I403e89f6ec953f6e2e63520b86e2cd464ebce6b3
 2015-01-16 16:19:32 -05:00
Derek Sollenberger
dbf22ccd92 Merge "Update HWUI to store its own SkBitmap objects" 2015-01-14 15:06:27 +00:00
Alan Viverette
b2b98a00e1 Force-commit changes on accept in spinner-style DatePickerDialog 
Bug: 19005472
Change-Id: If500c7305282a5055b4617c242871e04d91c0bc3
 2015-01-13 17:34:17 -08:00
Craig Mautner
ea002666cf am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev automerge: 82da2ee 
automerge: 1549346

* commit '1549346a98227c1f41fa4bd99921139f2cf97a14':
  Complete booting when frontmost activity is idle
 2015-01-13 22:11:48 +00:00
Craig Mautner
6245afc811 am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev automerge: 0f6da47 
automerge: 9d82182

* commit '9d82182f0c97271323d039b51e9179d2f4f2fa74':
  Add debug for ANR
 2015-01-13 22:10:25 +00:00
Craig Mautner
1549346a98 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 
automerge: 82da2ee

* commit '82da2ee927a86114f583b2ea8683076069e761e0':
  Complete booting when frontmost activity is idle
 2015-01-13 22:05:27 +00:00
Craig Mautner
9d82182f0c am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
automerge: 0f6da47

* commit '0f6da477cbf3232996770a17910d3e44a0b893ac':
  Add debug for ANR
 2015-01-13 22:03:04 +00:00
Craig Mautner
82da2ee927 am ef04ae79: Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 
* commit 'ef04ae79af58cc86c4312fac18c8a4eb24fc73ae':
  Complete booting when frontmost activity is idle
 2015-01-13 21:34:32 +00:00
Craig Mautner
0f6da477cb am 31ae1730: Merge "Add debug for ANR" into lmp-mr1-dev 
* commit '31ae17309e8c79c4b1a7b63a9c4bb43ae0849de2':
  Add debug for ANR
 2015-01-13 21:34:27 +00:00
Craig Mautner
ef04ae79af Merge "Complete booting when frontmost activity is idle" into lmp-mr1-dev 2015-01-13 21:28:37 +00:00
Craig Mautner
31ae17309e Merge "Add debug for ANR" into lmp-mr1-dev 2015-01-13 21:27:23 +00:00
Craig Mautner
bcb6eb9e26 Add debug for ANR 
Help for bug 17721767.

Change-Id: If863f3e6536be8af2c189dcc37d503c4d6b663b4
 2015-01-13 13:24:17 -08:00
Tyler Gunn
a80dec2d5c am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
automerge: c7105c4

* commit 'c7105c46002f5e47cde61d5cc3a92e557adc2fea':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 21:14:23 +00:00
Greg Hackmann
fcb3be7aaa am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e 
automerge: b5af40f

* commit 'b5af40f040f7c227604f129bcf79784c349c2ad5':
  Find wall clock RTC through sysfs
 2015-01-13 21:12:46 +00:00
Wink Saville
494601e39a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 21:09:10 +00:00
Bryce Lee
e843e24681 am 9320e9f0: Merge "Update javadoc for DEFAULT_FEATURES deprecation." into lmp-mr1-dev automerge: e036ce2 
automerge: 7e6fbb3

* commit '7e6fbb361be7a0045b8c71f0b8c56f113121a7d4':
  Update javadoc for DEFAULT_FEATURES deprecation.
 2015-01-13 21:07:16 +00:00
Adam Powell
9a67d191ab am 69c22e82: Merge "Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout" into lmp-mr1-dev automerge: 57744dd 
automerge: 1accc9c

* commit '1accc9c12ba9610bc592666c5f46be727f92e68d':
  Add API for nested pre-processing of a11y events; fix ResolverDrawerLayout
 2015-01-13 21:05:50 +00:00
Winson Chung
1240cc5b44 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev automerge: 7ce662e -s ours automerge: b1a0a57 -s ours 
automerge: 2b59fb9  -s ours

* commit '2b59fb902eb1f7d65f4a2fcfdaa6ea603d6dd6f0':
  DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
 2015-01-13 21:04:34 +00:00
Tyler Gunn
c7105c4600 am 0e5b3d4e: am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
* commit '0e5b3d4eabfa747bab39117d512d6218b8fa7783':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 20:58:12 +00:00
Greg Hackmann
b5af40f040 am 96f7ac84: Merge "Find wall clock RTC through sysfs" automerge: 41ef80e 
* commit '96f7ac84b51c3ceb913e78275e99e2f4f79ebe86':
  Find wall clock RTC through sysfs
 2015-01-13 20:53:06 +00:00
Greg Hackmann
96f7ac84b5 Merge "Find wall clock RTC through sysfs" 
automerge: 41ef80e

* commit '41ef80e7ff739d863ea5df0e129e54f953545212':
  Find wall clock RTC through sysfs
 2015-01-13 20:47:34 +00:00
Tyler Gunn
0e5b3d4eab am a27523e3: Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 
* commit 'a27523e3e0fd6c6cab18255151f2f9ec9a72f3d6':
  Fix for call timer resetting when starting IMS conference call. 1/4
 2015-01-13 20:47:18 +00:00
Greg Hackmann
41ef80e7ff Merge "Find wall clock RTC through sysfs" 2015-01-13 20:43:36 +00:00
Tyler Gunn
a27523e3e0 Merge "Fix for call timer resetting when starting IMS conference call. 1/4" into lmp-mr1-dev 2015-01-13 20:42:37 +00:00
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
Ricardo Cervera
f76ea8e4f9 am c2d95052: am 62ceea31: am f5569413: docs: Fix broken link in Common Intents automerge: c2d373a automerge: 8eb3060 automerge: cca3d44 
* commit 'c2d950521919f35c75d60013276fb422789151a2':
  docs: Fix broken link in Common Intents
 2015-01-13 20:33:19 +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
Elliott Hughes
c2b7abdbb2 am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit '1e14722167210e176cc1f6e702f1a7a98271c6d2':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 20:32:52 +00:00
Ricardo Cervera
abccd9d3c9 am 5849c0e4: am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs automerge: cb09d8d 
* commit '5849c0e4c6f8bf44de44e964ce365c0959070494':
  docs: Add parent calls to WatchFaces snippet.
 2015-01-13 20:32:15 +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
Joe Fernandez
07b4bfac5d am e3c10bf9: am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs automerge: d3b6d61 
* commit 'e3c10bf96c93672831a1126dea66b81eb52f7a43':
  docs: Removing obsolete L-Preview docs and images
 2015-01-13 20:31:54 +00:00
Joe Fernandez
67e0249df0 am eabea18e: am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs automerge: 56c56f7 
* commit 'eabea18ee897313c10091a653db3762321c3a40c':
  docs: Remove Wear preview reference docs
 2015-01-13 20:31:48 +00:00
Yang Ni
fdf3f43c58 am ae0278e9: am cc9efb78: am 21454aa2: Merge "New Script Group API." 
* commit 'ae0278e96627d3fee51b11988defb46c3ea23a7c':
  New Script Group API.
 2015-01-13 20:31:44 +00:00
Jason Monk
44f397efcf am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668 
* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
  Carrier text handle sim removal
 2015-01-13 20:31:32 +00:00
Ruchi Kandoi
22c0b4bc3e Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-01-13 20:31:30 +00:00
Prashant Malani
5c090ad791 am 0142097a: am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev automerge: 4212bf1 
* commit '0142097a0335b7839cf807c6e520b474811caa11':
  Improve the circularMask for round displays
 2015-01-13 20:30:41 +00:00
Prashant Malani
cd414c2931 am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev automerge: 4212bf1 
automerge: 0142097

* commit '0142097a0335b7839cf807c6e520b474811caa11':
  Improve the circularMask for round displays
 2015-01-13 20:30:03 +00:00
Eric Gilmore
f8e8fc5fb2 am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs automerge: 39b167a 
automerge: 85ac9f1

* commit '85ac9f153b3b1e2d1ed0c0fa571fe3dde5de8bd2':
  Adding Android Fundamentals video.
 2015-01-13 20:28:40 +00:00
Geoff Mendal
73ffaeb2af Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev automerge: 8858db6 -s ours 
automerge: eb99c82  -s ours

* commit 'eb99c8260252a90ff329f834b3b18088236d53f2':
  Import translations. DO NOT MERGE
 2015-01-13 20:26:39 +00:00
Eric Gilmore
1ff978a239 am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs automerge: 1908515 
automerge: 979dc00

* commit '979dc00bb9061d4bf448b9880096a323d06f19dd':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-13 20:23:29 +00:00
Neil Fuller
bd151d0842 am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 
automerge: 60b268f

* commit '60b268f039857211333e2ea1cc68e795a12d7e07':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
 2015-01-13 20:21:37 +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
Olawale Ogunwale
01e2fda02d am cacf5564: am e3f85985: Merge "bindService can\'t start up service process" 
automerge: d362d19

* commit 'd362d1936434148f332ab8c6c9c92c38aac0dac8':
  bindService can't start up service process
 2015-01-13 20:17:58 +00:00
Greg Hackmann
0eb5826830 Find wall clock RTC through sysfs 
Devices may have multiple RTCs.  By default the kernel uses rtc0 to
store the system time, but devices may override this (or even specify
that none of them should be used for system time).

Userspace can indirectly find the designated RTC through sysfs.  During
AlarmManagerService initialization, enumerate through all rtc class
devices to locate the device with attribute hctosys=1.

This is only done on devices without /dev/alarm, which has its own
in-kernel mechanism to pick the RTC.

Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
 2015-01-13 12:16:56 -08:00
Olawale Ogunwale
7dfe83d396 am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage." 
automerge: d07b9ea

* commit 'd07b9ea63dc37eaaf28bdf91b2edae62e2b35ee1':
  [ActivityManager] Fix process record leakage.
 2015-01-13 20:16:40 +00:00
Geoff Mendal
16fb7a3cfe am 3d9875f4: (-s ours) Import translations. DO NOT MERGE automerge: 83c2c04 -s ours 
automerge: 60d791c  -s ours

* commit '60d791c8640b30331ee710551e5fdc642fb432ff':
  Import translations. DO NOT MERGE
 2015-01-13 20:14:58 +00:00
Eric Laurent
cba9873ee2 Merge commit 'fe254b6e' into manualmerge 
Change-Id: If26269b8356155a0cb4c364c971866ec3b7e4ca6
 2015-01-13 11:54:38 -08:00
Craig Mautner
f3ea23ad9b Complete booting when frontmost activity is idle 
The boot process is intended to complete when the frontmost activity
becomes idle. This change fixes a corner case where the system was
booting and the Home activity became idle when it was not at the
front causing the system to never complete booting.

Before ag/603303 a secondary stack was created for the TaskPersister
at the beginning of activity manager systemReady(). Following that
change the secondary stack was created for the first time when a task
was restored from system ui recents when getTaskThumbnail() was
called. At the time it was created it was also moved to the front of
the stack order.

If that stack creation happens to occur after the Home activity is
started but before the Home activity becomes idle then the new stack
will obscure the Home activity and the boot process does not
complete.

1. This change adds a test for an idle activity coming to the front
when a stack is moving to the front and we haven't completed booting
yet. If this situation is detected the boot sequence is then
completed.

2. This change fixes the stack ordering so that creating a new task
when restoring recents does not automatically move the stack to the
front.

Fixes bug 18949470.

Change-Id: I243f0bb4396b518a0a8835c0c7bdccb2581a3520
 2015-01-13 11:27:30 -08:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00