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

274229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
de21e34536 Merge \\\"Check uid for notification policy access.\\\" into nyc-dev am: 8f17d2a48b am: 5921f81724 
am: 31ebd4ed30

Change-Id: I4abc8b2654daca9dd88a0e2a7acca63bc1d7484f
 2016-07-18 13:40:03 +00:00
Julia Reynolds
31ebd4ed30 Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b 
am: 5921f81724

Change-Id: I48923935bf394c39441335423a24dd0b88b8b51e
 2016-07-18 13:32:57 +00:00
Julia Reynolds
5921f81724 Merge \"Check uid for notification policy access.\" into nyc-dev 
am: 8f17d2a48b

Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a
 2016-07-18 13:25:51 +00:00
Julia Reynolds
8f17d2a48b Merge "Check uid for notification policy access." into nyc-dev 2016-07-18 13:16:16 +00:00
Derek Sollenberger
163c97a8ea Merge changes from topic 'skia_merge' 
* changes:
  Fix include to match Skia filename change
  Remove references to SkImageDecoder (part 2)
  Update SkiaCanvasProxy with SkSurface API change
  Return DNG mimeType for the case kDNG_SkEncodedFormat
  Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/1737693006.
  skia SkDocument - new MakePDF API, fix leak
 2016-07-18 12:07:44 +00:00
Andrei Stingaceanu
4e750e822f Merge "Keyboard shortcuts: minor Activity broadcast refactor" 2016-07-18 09:39:52 +00:00
Abodunrinwa Toki
cc59a84490 Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92 
am: c749762107

Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e
 2016-07-17 18:26:40 +00:00
Abodunrinwa Toki
c749762107 Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev 
am: 3b8e0fdf92

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
 2016-07-17 18:20:11 +00:00
Abodunrinwa Toki
3b8e0fdf92 Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev 2016-07-17 18:07:09 +00:00
Tim Murray
36030dda49 Merge \\"Make sure StrictMode allows disk reads when calling isThreadInProcess.\\" into nyc-mr1-dev am: afa67f3d34 
am: 62547293e3

Change-Id: Idc39bd967dfc45c9d66aaf5f28e1012c4c15bd78
 2016-07-16 19:29:44 +00:00
Tim Murray
62547293e3 Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev 
am: afa67f3d34

Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
 2016-07-16 19:25:37 +00:00
Tim Murray
afa67f3d34 Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev 2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6 Make sure StrictMode allows disk reads when calling isThreadInProcess. 
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
 2016-07-16 11:48:01 -07:00
Adam Lesinski
8024bf723c Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e 
am: 6a9f651b73

Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67
 2016-07-16 02:44:06 +00:00
Andreas Gampe
80c3459b3f Frameworks/base: Fix braino missing line am: 06eb24d95e 
am: 46d5eca989

Change-Id: I6cdcd67e7bed24819eac5e11fc775ef8f243a8e0
 2016-07-16 02:43:56 +00:00
Adam Lesinski
6a9f651b73 Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev 
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
 2016-07-16 02:38:24 +00:00
Andreas Gampe
46d5eca989 Frameworks/base: Fix braino missing line 
am: 06eb24d95e

Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335
 2016-07-16 02:38:18 +00:00
TreeHugger Robot
c3829f528e Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev 2016-07-16 02:33:55 +00:00
Robert Shih
6f5be322d2 MediaRecorder: fix OnInfo related documentation 
The original documentation said MediaRecorder.OnInfoListener was called for
error cases.

Bug: 25424209
Change-Id: Ic8d2dee67b15a64604a959e7e6964436da92d6ba
 2016-07-15 18:39:42 -07:00
Andreas Gampe
06eb24d95e Frameworks/base: Fix braino missing line 
This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb
 2016-07-15 18:13:48 -07:00
Adam Lesinski
aa19d5e49e Deprecate Resources constructor and updateConfiguration() method 
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
 2016-07-15 18:01:48 -07:00
Andrew Solovay
9861e15482 Merge \"Merge \\\"docs: Updating N Preview \\\"behavior changes\\\" doc for DP5\\\" into nyc-dev am: 9d3bc86207 am: 72022a691a\" into nyc-mr1-dev-plus-aosp 
am: 4eb66d1d4b

Change-Id: I43f9400975fef2ecf15806c0de40b6af4d9f75cb
 2016-07-16 00:49:45 +00:00
Andrew Solovay
731d2f5678 Merge \\\"docs: Updating N Preview \\\"behavior changes\\\" doc for DP5\\\" into nyc-dev am: 9d3bc86207 am: 8af870a778 
am: 7097984ba5

Change-Id: I02fc4ceec95c994dcbc915ac3a28f21740e376e0
 2016-07-16 00:49:41 +00:00
Android Build Merger (Role)
4eb66d1d4b Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 am: 72022a691a" into nyc-mr1-dev-plus-aosp 2016-07-16 00:41:57 +00:00
Andrew Solovay
45368cd044 Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 
am: 72022a691a

Change-Id: I4c85652bbc4d67507c419b5362341e993f932866
 2016-07-16 00:41:33 +00:00
Andrew Solovay
7097984ba5 Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 
am: 8af870a778

Change-Id: I257e7b0774f7892373963883a362b44ba5ec4759
 2016-07-16 00:41:16 +00:00
Andrew Solovay
93a074c7c2 Merge \"Merge \\\"docs: Updating N Preview \\\"API Overview\\\" doc for DP5\\\" into nyc-dev am: 833722e049 am: f5f50cfc7a\" into nyc-mr1-dev-plus-aosp 
am: f00bbba326

Change-Id: I4c9feb5461ad10e5afa5d5be24547535616535b5
 2016-07-16 00:35:50 +00:00
Andrew Solovay
3e40041ec6 Merge \\\"docs: Updating N Preview \\\"API Overview\\\" doc for DP5\\\" into nyc-dev am: 833722e049 am: 843979a3b3 
am: 3cbde13f9e

Change-Id: I2716e851fdf2af3dc880f9466570575e235bd961
 2016-07-16 00:35:47 +00:00
Andrew Solovay
72022a691a Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev 
am: 9d3bc86207

Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31
 2016-07-16 00:35:41 +00:00
Andrew Solovay
8af870a778 Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev 
am: 9d3bc86207

Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397
 2016-07-16 00:35:31 +00:00
Android Build Merger (Role)
f00bbba326 Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 am: f5f50cfc7a" into nyc-mr1-dev-plus-aosp 2016-07-16 00:30:15 +00:00
Andrew Solovay
d8333334f8 Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 
am: f5f50cfc7a

Change-Id: Icc3d60d6ad55805be520975033e2a0f157721c50
 2016-07-16 00:29:49 +00:00
Andrew Solovay
3cbde13f9e Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 
am: 843979a3b3

Change-Id: I9a86bd40709f5a9006f669cbdbd94d10bfd8d555
 2016-07-16 00:28:26 +00:00
TreeHugger Robot
9d3bc86207 Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev 2016-07-16 00:24:49 +00:00
Andrew Solovay
f5f50cfc7a Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev 
am: 833722e049

Change-Id: Id869d494381ff6e53066eab1dcbb4a3ee447384d
 2016-07-16 00:23:00 +00:00
Andrew Solovay
843979a3b3 Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev 
am: 833722e049

Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806
 2016-07-16 00:22:59 +00:00
Amith Yamasani
973fe42f8f Merge \\"Block camera gesture during secondary user SUW\\" into nyc-mr1-dev am: e1a3a449a4 
am: d0cecf9d67

Change-Id: I675832bc2c88477c8cf5e70f30a5b8e9b25048ff
 2016-07-16 00:22:04 +00:00
TreeHugger Robot
833722e049 Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev 2016-07-16 00:13:17 +00:00
Steve McKay
ae267cedce Merge \\"Include an app icon.\\" into nyc-mr1-dev am: 3d8c9981b5 
am: a8387db55e

Change-Id: Ibe38576f5bada20131d05e550d93f6b6be54179f
 2016-07-16 00:12:53 +00:00
Amith Yamasani
d0cecf9d67 Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev 
am: e1a3a449a4

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84
 2016-07-16 00:12:03 +00:00
Steve McKay
a8387db55e Merge \"Include an app icon.\" into nyc-mr1-dev 
am: 3d8c9981b5

Change-Id: I14f2d90fc7c0f21ab0fe6b993c1ef6d8ed665831
 2016-07-16 00:06:10 +00:00
Doris Liu
58eaa13f18 Merge \\"Ensure native allocation/free is correctly registered\\" into nyc-mr1-dev am: a7272b4cad 
am: f5b87ce908

Change-Id: Ic04a562f2c32cb0187713f2b661e35fb3f7f6023
 2016-07-16 00:04:42 +00:00
TreeHugger Robot
e1a3a449a4 Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev 2016-07-16 00:03:52 +00:00
TreeHugger Robot
3d8c9981b5 Merge "Include an app icon." into nyc-mr1-dev 2016-07-15 23:59:46 +00:00
Doris Liu
f5b87ce908 Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev 
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb
 2016-07-15 23:56:24 +00:00
Makoto Onuki
17e94691c2 Merge \\"Don\\'t accept resource references in string fields\\" into nyc-mr1-dev am: 6fa0e4d518 
am: 3d3e2e2b17

Change-Id: Ib5a83728239cfa074fb9800b76bc217dcf990b30
 2016-07-15 23:56:03 +00:00
Makoto Onuki
3d3e2e2b17 Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev 
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05
 2016-07-15 23:50:51 +00:00
Doris Liu
a7272b4cad Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev 2016-07-15 23:46:08 +00:00
Makoto Onuki
6fa0e4d518 Merge "Don't accept resource references in string fields" into nyc-mr1-dev 2016-07-15 23:41:11 +00:00
Jeff Sharkey
8dd615fd07 Merge \"Merge \\"Build both filename views before deleting.\\" into nyc-mr1-dev am: fff6a11438\" into nyc-mr1-dev-plus-aosp 
am: 40a4bf7dc1

Change-Id: Iabb5ffbc0ef161bb67d373fd13385e05d88b4179
 2016-07-15 23:37:29 +00:00