Commit Graph

184112 Commits

Author SHA1 Message Date
John Spurlock
63b9e8200e Merge "Volume policy updates." 2015-03-13 00:59:34 +00:00
Wenchao Tong
c3b022ded1 Merge "NetworkStatsService to adjust VPN stats before recording." 2015-03-13 00:54:09 +00:00
Wenchao Tong
f5ea340aab NetworkStatsService to adjust VPN stats before recording.
* Creates a new Parcelable class VpnInfo to hold required
  parameters for VPN stats adjustments.
* ConnectivityService to collect infomation and provide
  a list of VpnInfo, one for each user.
* NetworkStatsService passes the VpnInfo array to
  NetworkStatsRecorder.
* NetworkStatsRecorder calls NetworkStats.migrateTun()
  to do the math.
* Poll NetworkStats when the vpn application calls
  setUnderlyingNetworks().

Bug: 19536273
Change-Id: I7a4c7726b8243fead10416f7ec6eb5cf95f20183
2015-03-12 17:43:41 -07:00
Hui Shu
d7c7e566aa Merge "Add API for WebView OffscreenPreRaster setting." 2015-03-13 00:38:47 +00:00
Luan Nguyen
e72dca4901 am 6c881ec9: am 872a731e: am a0f20621: am dd7d025b: am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '6c881ec9d588202172c45f3152c15fe0069b0ebb':
  Revert "docs: Update auto landing and design page image assets"
2015-03-13 00:03:06 +00:00
Marco Nelissen
a80ac05f85 resolved conflicts for merge of 42f55d1e to master
Change-Id: I9c26861c5b0e26bb55e50b2133b7561348a01aec
2015-03-12 16:17:45 -07:00
Hui Shu
b1ee70b149 Add API for WebView OffscreenPreRaster setting.
BUG: 19592029
Change-Id: Ic903b823e5f7830e2cf2d4f3dd9a5458334648a3
2015-03-12 16:04:07 -07:00
Wale Ogunwale
d58617b4f5 Merge "Protect against NPE for ActivityRecords without a stack." 2015-03-12 22:31:05 +00:00
Wale Ogunwale
ab48bc164f Merge "Revert "Revert "Remove activity and window stacks when last task is removed.""" 2015-03-12 22:30:49 +00:00
Wenchao Tong
8726e9a73e Merge "NetworkStats to support VPN accounting." 2015-03-12 22:10:56 +00:00
Wale Ogunwale
7d701174f4 Protect against NPE for ActivityRecords without a stack.
A previous change allowed us to remove stack that no longer contained
any task. This was causing some NPE when an ActivityRecord.Token or
some other cached ActivityRecord later gets converted back to an
ActivityRecord and we try to access its stack.

Bug: 19552874
Change-Id: Ie9454bbce56591b337f97af40f8c00b8597becdf
2015-03-12 15:03:22 -07:00
Roozbeh Pournader
4f831caa49 Merge "Fix negative touch word offset that caused crashing when selecting text" 2015-03-12 21:45:22 +00:00
Luan Nguyen
55cff0b419 am 3df87bac: am 5228d083: am 0c3282b5: am 50a9b835: am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '3df87baca9b62acdd425ea2dc8ae390e311ae6a3':
  docs: Update auto landing and design page image assets
2015-03-12 21:33:28 +00:00
Rich Slogar
7f92c27ff8 am 964b4018: am 40055c22: am 11558e5d: am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '964b4018499a0e1a50364f81f576a7181252841a':
  docs: eclipse revisions update
2015-03-12 21:33:21 +00:00
Andrew Solovay
f3bc27fd02 am fd9d8c7b: am e5fd6c76: am 3d950de4: am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit 'fd9d8c7bcb81c31b7b43eb4f88ab8fc583ea9ac2':
  docs: Revisions to "Providing Messaging for Auto"
2015-03-12 21:33:14 +00:00
Jeff Brown
c3eea84a0b Merge "Revert "Update ParcelFileDescriptor to use non-blocking I/O."" 2015-03-12 21:25:40 +00:00
Jeff Brown
0f0b7f2fb3 Revert "Update ParcelFileDescriptor to use non-blocking I/O."
Bug: 19715279
This reverts commit a34a3bdcbf.

Change-Id: Ief03dee1c0a2b4d906797a5c279663c17439c347
2015-03-12 21:25:00 +00:00
Vishwath Mohan
1808d437e6 Merge "Enforce null-termination in ResStringPool::stringAt" 2015-03-12 21:17:50 +00:00
Yin-Chia Yeh
d6ee06a0c8 Merge "Camera: add @hide API for setting camera rotation" 2015-03-12 20:36:49 +00:00
Prashant Malani
737298b93e am 276d1bc9: am a98c21a6: Make circular mask thickness configurable
* commit '276d1bc929485e53ba4d4e93d4cc3ded3fcc2fc3':
  Make circular mask thickness configurable
2015-03-12 20:31:52 +00:00
Justin Koh
efac42a019 am e011eb4f: am dff0fdb4: Merge "Add translatable=false to dozeComponent" into lmp-mr1-modular-dev
* commit 'e011eb4ff9a082de69fea747141764de2f6f3dcc':
  Add translatable=false to dozeComponent
2015-03-12 20:31:41 +00:00
Mady Mellor
27d6b97f63 Fix negative touch word offset that caused crashing when selecting text
Previously the offset between the touch event and the start / end of
the word could result in a negative value - we don't care or want
this value to be negative. The negative value also causes the returned
offset to be outside the bounds of the text which resulted in a crash.

Bug: 19705184
Change-Id: I4287df7778c246dd10654f1a1f1e57538e940730
2015-03-12 19:24:26 +00:00
Ronghua Wu
67cf4a06c7 Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager." 2015-03-12 18:05:47 +00:00
John Spurlock
a48d779dad Volume policy updates.
- Make volume policy settable by the volume UI instead
   of hardcoded in AudioService.
 - Add status bar icon for silent mode.
 - Limit unmute-on-volume-adjust behavior to tvs.
 - Ensure all changes to device volume are sent through
   setIndex so no change events are missed.

Bug: 19260237
Change-Id: Iea070a7a6f90ff620e39629f2da3f33f87223d72
2015-03-12 13:57:08 -04:00
Filip Gruszczynski
c6ee744a90 Merge "Allow polling for WindowInsets." 2015-03-12 15:12:45 +00:00
John Spurlock
80c24d4a27 Merge "AudioService: Write base stream volume changes to the event log." 2015-03-12 14:50:28 +00:00
Jason Monk
78981e0393 Merge "Make QS use SettingsLib's BT code" 2015-03-12 14:23:51 +00:00
John Spurlock
9087433753 AudioService: Write base stream volume changes to the event log.
- Add a new volume_changed event, reported at the stream level.
 - Only include changes to base streams (no aliases).
 - Include the caller for each change.  A caller is either:
   -  a pkg name (for external calls or known media sessions)
   -  a system server class's log tag (for internal calls,
      disambiguates "android")

Bug: 19599935
Change-Id: Ia61b68ff1e7e2907a24972790ec052bfe099e665
2015-03-12 09:54:10 -04:00
Leon Scroggins III
af66416e4b Merge "Make Bitmap_createFromParcel check the color count." 2015-03-12 12:24:11 +00:00
Clara Bayarri
f84a9724f1 Move the "Replace" popup option to the Text Selection ActionMode.
As a first step in unifying the cut/copy/paste ActionMode in Editor
with the paste/replace popup, I'm moving the replace option to
the CAB ActionMode. Paste is already there, so for now all options
are together.

Missing things to address in upcoming CLs:
- Invoke the ActionMode in all cases where the popup shows up now,
ensuring only the options that are currently available show up.
- Get rid of the current popup
- Make the ActionMode a floating toolbar (pending feature completion)
- Define a keyboard shortcut for replace?

Note that since the ActionMode still shows up in the ActionBar and
replace has no icon it now appears as text and takes up lots of
space. This will improve when we can switch to using a floating
toolbar.

Change-Id: Ib6b60bae9b58e4db96b9c4cee556e19d3f1bb466
2015-03-12 10:31:11 +00:00
Jim Miller
216ce5d7b2 Merge "Add rename support to FingerprintManager" 2015-03-12 01:20:05 +00:00
Jim Miller
99d6019bea Add rename support to FingerprintManager
Bug 19592835

Change-Id: I656b3932caf2cfdb9a330522d171a59af2c7a2d1
2015-03-11 18:17:55 -07:00
Greg Hackmann
d5e97f93f0 Fix 64-bit MessageQueue JNI build
Change-Id: I75b3788e7dcece4a2d64d969a10d28e7a9593cd6
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-11 16:54:37 -07:00
Vishwath Mohan
6521a1b743 Enforce null-termination in ResStringPool::stringAt
Rejects any non null-terminated string that a caller asks
ResStringPool::stringAt for, returning NULL instead.

The rationale for returning NULL rather than amending the string to add
a null-terminator is that conformant APK files will have all their
strings null-terminated anyway, and that this is a possible signal of a
malformed package.

Bug: 15288069
Change-Id: I370937b92f2cadf67fbd54203cbc7d1494be969f
2015-03-11 16:36:53 -07:00
Christopher Tate
871e96ab8b Merge "Don't run full backups on stopped packages" 2015-03-11 23:36:49 +00:00
Christopher Tate
b538d3c06f Don't run full backups on stopped packages
We already decline to run key/value backup passes for (participating)
apps that are in the 'stopped' state.  Now we also properly avoid
full-data backup passes on such apps.

Bug 19684052

Change-Id: Ieafc07b5531a91a243d57238c53db41ad3459140
2015-03-11 16:35:12 -07:00
Craig Mautner
9c1353ee6c am 20553036: am 68694780: Merge "[ActivityManager] Fix index OOB when resetting removed task"
* commit '20553036af92a6369b3e53f54a1f4f0ccaf8e981':
  [ActivityManager] Fix index OOB when resetting removed task
2015-03-11 23:02:44 +00:00
Jeff Brown
a34a3bdcbf Update ParcelFileDescriptor to use non-blocking I/O.
Avoids spinning up a thread just to watch a file descriptor.

Bug: 10349083
Change-Id: I814cb252f075d7a162e1286bbfd1dbec28d17796
2015-03-11 15:37:21 -07:00
Jeff Brown
dc3eb4bf91 Add support for non-blocking I/O with Looper.
Bug: 10349083
Change-Id: I4a94b1eac53df57c05103913bd593d92b1e062d7
2015-03-11 15:00:35 -07:00
Jeff Brown
803c2affcb Expose some useful methods on Looper and clean up docs.
Change-Id: I40796c3ba07d3c50043da56e835f11fbf9852d30
2015-03-11 15:00:35 -07:00
Jeff Brown
3d4e7efe37 Move sync barrier methods into MessageQueue.
The methods were previously defined on Looper but on reflection
they actually make more sense on the MessageQueue instead since
the Looper class is primarily concerned with thread lifecycle
rather than the actual messages themselves.

Change-Id: Iff356b94754fc9960774fa17e3eec9604229cba6
2015-03-11 15:00:34 -07:00
Jeff Brown
6c7b41adf9 Rename Looper::isIdling() to isPolling() to resolve confusion.
The loop isn't technically idle at this time, it's just checking
whether any file descriptors have pending events.  However it's
still a good signal as to whether the loop is alive.

Added a real isIdle() function.

Bug: 19532373
Change-Id: Idd273e8774f469ccafb00d560818cf279dfd6ba6
2015-03-11 15:00:34 -07:00
Wale Ogunwale
04f4d6bb88 Revert "Revert "Remove activity and window stacks when last task is removed.""
This reverts commit 7a7bf5ea48.
2015-03-11 14:56:02 -07:00
Raph Levien
044644c717 Merge "Fix XML parsing crash in SettingsProvider" 2015-03-11 21:50:02 +00:00
Raph Levien
174fa280d1 Fix XML parsing crash in SettingsProvider
A previous change added more whitespace to settings_global.xml to
improve human readability, but the parser is overly picky in ignoring
whitespace. This patch makes it accept all whitespace strings.

Bug: 19696812
Change-Id: I3ebb8f6df2e25f4e6b6841da743be3f3a91e2442
2015-03-11 14:37:45 -07:00
Alan Viverette
cd3c33e6bc Merge "Fix dialog overlay theme background color, add theme attr" 2015-03-11 21:24:46 +00:00
Alan Viverette
c0653dad13 Fix dialog overlay theme background color, add theme attr
Bug: 19524852
Change-Id: Id3188d5c0ac9ef985bb17831c46a8aff20f89bc1
2015-03-11 14:21:14 -07:00
Filip Gruszczynski
954289d9a9 Allow polling for WindowInsets.
Change-Id: I36feb2403b1bcf6de5d8808734c46999a38e7403
2015-03-11 14:11:58 -07:00
Alan Viverette
1130363f18 Merge "Various fixes for popup monkey testing" 2015-03-11 21:04:28 +00:00
Chet Haase
31f2b619fb Merge "Fix artifacts in clip reveal animations" 2015-03-11 20:57:31 +00:00