OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 0f167ab4: am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 22:35:31 +0000 (22:35 +0000)]
am 0f167ab4: am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev

* commit '0f167ab4b189a017ed11311683e2824799ea8d01':
  Update asan/app_process.

9 years agoam 3ef682bd: am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for...
Quddus Chong [Thu, 28 May 2015 22:35:25 +0000 (22:35 +0000)]
am 3ef682bd: am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit '3ef682bd361a41a6c5a088ce8f902dec8eacc56e':
  docs: Misc. fixes for M Preview docs.

9 years agoam 1dfb539b: am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMetho...
Olawale Ogunwale [Thu, 28 May 2015 22:35:17 +0000 (22:35 +0000)]
am 1dfb539b: am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

* commit '1dfb539b50fbcf06ee750935d9a4771bff1173ab':
  Revert "Revert "Remove debugging and skip InputMethod windows""

9 years agoam 87d969a8: am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev
John Spurlock [Thu, 28 May 2015 22:35:02 +0000 (22:35 +0000)]
am 87d969a8: am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev

* commit '87d969a8938b4fab1aa0c394145727b667f8d1c4':
  Backup/restore notification policy.

9 years agoam 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPaddin...
Doris Liu [Thu, 28 May 2015 22:34:57 +0000 (22:34 +0000)]
am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev

* commit '7b554a8f1513c1737a9326b7e99b83fe5aab53f0':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag

9 years agoam 0ea60834: am 6ac0c8c5: lock device orientation during app compatibility test
Guang Zhu [Thu, 28 May 2015 22:34:51 +0000 (22:34 +0000)]
am 0ea60834: am 6ac0c8c5: lock device orientation during app compatibility test

* commit '0ea60834f7dac863ead8710e92ca11003974775b':
  lock device orientation during app compatibility test

9 years agoam fc2cb155: am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection...
Bryce Lee [Thu, 28 May 2015 22:34:43 +0000 (22:34 +0000)]
am fc2cb155: am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit 'fc2cb1551e397c041551f648f44f32cdaca8f089':
  Introduce indirection for base micro themes.

9 years agoam e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distrib...
Adam Lesinski [Thu, 28 May 2015 22:34:37 +0000 (22:34 +0000)]
am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

* commit 'e87126e8915785e1801580d44ea181304bbfa701':
  BatteryStats: Output per-app wifi controller distribution

9 years agoam 2da36fb3: am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix....
David Friedman [Thu, 28 May 2015 22:34:18 +0000 (22:34 +0000)]
am 2da36fb3: am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit '2da36fb340359c113db532796ed33799503680d8':
  Docs: Quick typo fix.

9 years agoam 1532af39: am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for...
Luan Nguyen [Thu, 28 May 2015 22:34:12 +0000 (22:34 +0000)]
am 1532af39: am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '1532af398059b21c1e38d1012c3f76ad084ffe48':
  docs: Fix bad heading link for doze-standby

9 years agoam bf7fe1e0: Merge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 21:36:13 +0000 (21:36 +0000)]
am bf7fe1e0: Merge "Update asan/app_process." into mnc-dev

* commit 'bf7fe1e051fefc5e6c1b96411a842b0305a9192c':
  Update asan/app_process.

9 years agoam 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs...
Quddus Chong [Thu, 28 May 2015 21:36:09 +0000 (21:36 +0000)]
am 0e591ef2: am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit '0e591ef26ae060bf1d47ffdd02b23b5da416fad7':
  docs: Misc. fixes for M Preview docs.

9 years agoMerge "Update asan/app_process." into mnc-dev
Evgenii Stepanov [Thu, 28 May 2015 21:30:56 +0000 (21:30 +0000)]
Merge "Update asan/app_process." into mnc-dev

9 years agoam 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc...
Quddus Chong [Thu, 28 May 2015 21:20:18 +0000 (21:20 +0000)]
am 7138643f: am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit '7138643f4185d402ac216cfcfe3c871c860bf84e':
  docs: Misc. fixes for M Preview docs.

9 years agoam aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows...
Olawale Ogunwale [Thu, 28 May 2015 21:12:17 +0000 (21:12 +0000)]
am aa47d8d9: Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

* commit 'aa47d8d97600e439c73cdbdcc47db44e71831ea6':
  Revert "Revert "Remove debugging and skip InputMethod windows""

9 years agoam d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
Quddus Chong [Thu, 28 May 2015 21:05:02 +0000 (21:05 +0000)]
am d5db0f63: Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

* commit 'd5db0f63b4cf03294c2871eb3bf9d3b944700788':
  docs: Misc. fixes for M Preview docs.

9 years agoMerge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev
Olawale Ogunwale [Thu, 28 May 2015 20:59:09 +0000 (20:59 +0000)]
Merge "Revert "Revert "Remove debugging and skip InputMethod windows""" into mnc-dev

9 years agoMerge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs
Quddus Chong [Thu, 28 May 2015 20:47:14 +0000 (20:47 +0000)]
Merge "docs: Misc. fixes for M Preview docs." into mnc-preview-docs

9 years agoam 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev
John Spurlock [Thu, 28 May 2015 20:39:44 +0000 (20:39 +0000)]
am 517f3ee4: Merge "Backup/restore notification policy." into mnc-dev

* commit '517f3ee41afb7713f1fc6fa37a6f3a6efa97a020':
  Backup/restore notification policy.

9 years agoam 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into...
Doris Liu [Thu, 28 May 2015 20:39:39 +0000 (20:39 +0000)]
am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev

* commit '057d93971a5415a989ec5c8a8b0437ee12b6604f':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag

9 years agoam 6ac0c8c5: lock device orientation during app compatibility test
Guang Zhu [Thu, 28 May 2015 20:39:33 +0000 (20:39 +0000)]
am 6ac0c8c5: lock device orientation during app compatibility test

* commit '6ac0c8c5faaa2fdf56a533a6a3452d53850809ee':
  lock device orientation during app compatibility test

9 years agoMerge "Backup/restore notification policy." into mnc-dev
John Spurlock [Thu, 28 May 2015 20:34:17 +0000 (20:34 +0000)]
Merge "Backup/restore notification policy." into mnc-dev

9 years agoMerge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev
Doris Liu [Thu, 28 May 2015 20:33:11 +0000 (20:33 +0000)]
Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev

9 years agoFix ScrollView's EdgeEffect to respect clipToPadding flag
Doris Liu [Thu, 28 May 2015 17:18:46 +0000 (10:18 -0700)]
Fix ScrollView's EdgeEffect to respect clipToPadding flag

bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408

9 years agolock device orientation during app compatibility test
Guang Zhu [Thu, 28 May 2015 20:22:28 +0000 (13:22 -0700)]
lock device orientation during app compatibility test

Devices on test benches are usually held sideways, which leads to app
rotation during launch. While it's useful to identify such issue from an
app perspective, the app compatibility test should be isolated from such
noise for the purpose of the testing for basic level of compatibility.

Change-Id: I403f96e5d8512ca6a17b05a83d69f4b02f760a32

9 years agoBackup/restore notification policy.
John Spurlock [Thu, 28 May 2015 15:24:10 +0000 (11:24 -0400)]
Backup/restore notification policy.

 - Include zen + ranking config in the backup payload.
 - Owner user only for now.
 - For the most part, reuse existing policy file structure
   as the payload format, but elide items that do not survive
   across devices (info for secondary users, uids).
 - Also elide the manual zen rule, if set.
 - During restore, keep ranking info for uninstalled apps
   in purgatory until the apps exist.

Bug: 17755700
Change-Id: Iadf71a43cd0efd44fe9a0a29874d60666b6d2076

9 years agodocs: Misc. fixes for M Preview docs.
Quddus Chong [Thu, 28 May 2015 17:13:14 +0000 (10:13 -0700)]
docs: Misc. fixes for M Preview docs.

Change-Id: I816bb18d0110a4a7e585fe727471c2356a93caac

9 years agoam efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."
David Srbecky [Thu, 28 May 2015 20:16:45 +0000 (20:16 +0000)]
am efe01cc6: am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."

* commit 'efe01cc62ee49f57c34726ec9c13ddaa9c1b1d8b':
  Replace --include-cfi with --generate-debug-info.

9 years agoam b8e100d7: am 495ebb11: Merge "Update asan/app_process."
Evgenii Stepanov [Thu, 28 May 2015 20:16:39 +0000 (20:16 +0000)]
am b8e100d7: am 495ebb11: Merge "Update asan/app_process."

* commit 'b8e100d7a46b1bee4b2e055fb354bfc72df8809c':
  Update asan/app_process.

9 years agoam 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro...
Bryce Lee [Thu, 28 May 2015 20:15:44 +0000 (20:15 +0000)]
am 3aeb5f84: am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit '3aeb5f848eee2c6de9bb49c9dcc7ca5127ef7c1e':
  Introduce indirection for base micro themes.

9 years agoam 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into...
Adam Lesinski [Thu, 28 May 2015 20:15:39 +0000 (20:15 +0000)]
am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

* commit '8a179cab7971782900f5b4a872f4f432c7d17987':
  BatteryStats: Output per-app wifi controller distribution

9 years agoam 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into...
Bryce Lee [Thu, 28 May 2015 20:07:57 +0000 (20:07 +0000)]
am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.

9 years agoMerge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
Adam Lesinski [Thu, 28 May 2015 20:04:16 +0000 (20:04 +0000)]
Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev

9 years agoam f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
Bryce Lee [Thu, 28 May 2015 19:52:17 +0000 (19:52 +0000)]
am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.

9 years agoBatteryStats: Output per-app wifi controller distribution
Adam Lesinski [Thu, 28 May 2015 18:38:12 +0000 (11:38 -0700)]
BatteryStats: Output per-app wifi controller distribution

Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0

9 years agoUpdate asan/app_process.
Evgenii Stepanov [Thu, 7 May 2015 17:55:59 +0000 (10:55 -0700)]
Update asan/app_process.

Build both 32 and 64-bit versions and don't limit it to eng.

Change-Id: I5d6cc8005291100d5fe0f1385e8a0b4ba5f4d630
(cherry picked from commit e740b17d2400ed0db17d1f7fce4f052bbbf808ab)

9 years agoMerge "Introduce indirection for base micro themes." into cw-d-mr1-dev
Bryce Lee [Thu, 28 May 2015 19:39:44 +0000 (19:39 +0000)]
Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev

9 years agoam e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview...
David Friedman [Thu, 28 May 2015 19:36:56 +0000 (19:36 +0000)]
am e9ac8174: am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit 'e9ac81745ef0c5f0d96a2c9dfcf2f84a86ccf85d':
  Docs: Quick typo fix.

9 years agoam dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:36:51 +0000 (19:36 +0000)]
am dd054f50: am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit 'dd054f505b42c295baaca375d22c737fcb0fcb92':
  docs: Fix bad heading link for doze-standby

9 years agoam 2c530e41: am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev
Peng Xu [Thu, 28 May 2015 19:29:24 +0000 (19:29 +0000)]
am 2c530e41: am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev

* commit '2c530e41e0e5ed7b30693a8eff8f14029a27ea45':
  Bug fix and documentation clarification

9 years agoam f4dcdc02: am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links...
Joe Fernandez [Thu, 28 May 2015 19:29:19 +0000 (19:29 +0000)]
am f4dcdc02: am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit 'f4dcdc022514dce700d2332348544c63edc700cb':
  docs: Fix broken links on M Preview.

9 years agoam 0fb1421c: am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html...
Luan Nguyen [Thu, 28 May 2015 19:29:13 +0000 (19:29 +0000)]
am 0fb1421c: am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references

* commit '0fb1421c448eea5982280e3ddd84efbcafba81e3':
  docs: Remove api-changes.html and references

9 years agoam dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 19:20:19 +0000 (19:20 +0000)]
am dd6ccfd0: am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit 'dd6ccfd0d97c7a794793cd465be029310efa67ea':
  Docs: Quick typo fix.

9 years agoam 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:20:13 +0000 (19:20 +0000)]
am 15afeaa9: am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '15afeaa99f6da12f6237a2b24fdd544b298bf589':
  docs: Fix bad heading link for doze-standby

9 years agoam 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev
Peng Xu [Thu, 28 May 2015 19:15:31 +0000 (19:15 +0000)]
am 08ecf676: Merge "Bug fix and documentation clarification" into mnc-dev

* commit '08ecf676e655ba7a86744f63045290d1e331c0f6':
  Bug fix and documentation clarification

9 years agoam e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview...
Joe Fernandez [Thu, 28 May 2015 19:15:26 +0000 (19:15 +0000)]
am e0e8570d: am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit 'e0e8570d591cd833f9950c4ac0de8ca425c47f95':
  docs: Fix broken links on M Preview.

9 years agoam 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 19:15:20 +0000 (19:15 +0000)]
am 587748cd: am a21ff962: am c5d3758e: docs: Remove api-changes.html and references

* commit '587748cdf78fe0149fef6a0e0ed9099ab804cb1c':
  docs: Remove api-changes.html and references

9 years agoam 4ca27389: am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting...
David Friedman [Thu, 28 May 2015 19:11:08 +0000 (19:11 +0000)]
am 4ca27389: am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script.

* commit '4ca273898807c417668b5487e9edbf0b934c7f31':
  Docs: IO quick fix--commenting out part of script.

9 years agoam 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 19:03:28 +0000 (19:03 +0000)]
am 8bf833e4: Merge "Docs: Quick typo fix." into mnc-preview-docs

* commit '8bf833e40f403f5f40233bf7c68778b2401c5673':
  Docs: Quick typo fix.

9 years agoam 2429cc41: docs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 19:03:21 +0000 (19:03 +0000)]
am 2429cc41: docs: Fix bad heading link for doze-standby

* commit '2429cc419794a06866670675a5e5b3d7a746dd6b':
  docs: Fix bad heading link for doze-standby

9 years agoMerge "Docs: Quick typo fix." into mnc-preview-docs
David Friedman [Thu, 28 May 2015 18:59:46 +0000 (18:59 +0000)]
Merge "Docs: Quick typo fix." into mnc-preview-docs

9 years agoMerge "Bug fix and documentation clarification" into mnc-dev
Peng Xu [Thu, 28 May 2015 18:57:45 +0000 (18:57 +0000)]
Merge "Bug fix and documentation clarification" into mnc-dev

9 years agoam 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-previ...
Joe Fernandez [Thu, 28 May 2015 18:54:43 +0000 (18:54 +0000)]
am 46e58a17: am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit '46e58a17890f9013f2d3714607c4c835df3638e0':
  docs: Fix broken links on M Preview.

9 years agoam 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of...
David Friedman [Thu, 28 May 2015 18:54:40 +0000 (18:54 +0000)]
am 319213ee: am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script.

* commit '319213eea1438bfa348a4099b5e1d6d8f92d0c4d':
  Docs: IO quick fix--commenting out part of script.

9 years agoam a21ff962: am c5d3758e: docs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 18:54:39 +0000 (18:54 +0000)]
am a21ff962: am c5d3758e: docs: Remove api-changes.html and references

* commit 'a21ff9621e3b9b8d64945ea55165acf435acd9b9':
  docs: Remove api-changes.html and references

9 years agodocs: Fix bad heading link for doze-standby
Luan Nguyen [Thu, 28 May 2015 18:48:31 +0000 (11:48 -0700)]
docs: Fix bad heading link for doze-standby

bug: 21491909
Change-Id: Id8c10262ab311aca42d3b4d37a479d6543530505

9 years agoam 07b815ea: am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings...
Sanket Padawe [Thu, 28 May 2015 18:45:40 +0000 (18:45 +0000)]
am 07b815ea: am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev

* commit '07b815ea1878126557bd07df741c2c7d5fbc4f6a':
  Fix display of "null" string shown in Wifi Settings for AP.

9 years agoam 3976a569: Merge "Replace --include-cfi with --generate-debug-info."
David Srbecky [Thu, 28 May 2015 18:45:36 +0000 (18:45 +0000)]
am 3976a569: Merge "Replace --include-cfi with --generate-debug-info."

* commit '3976a56904e359eb975395725e908122d7d6e466':
  Replace --include-cfi with --generate-debug-info.

9 years agoam 495ebb11: Merge "Update asan/app_process."
Evgenii Stepanov [Thu, 28 May 2015 18:45:30 +0000 (18:45 +0000)]
am 495ebb11: Merge "Update asan/app_process."

* commit '495ebb119bd1cea64f985367ba3bb87594e4fa81':
  Update asan/app_process.

9 years agoMerge "Replace --include-cfi with --generate-debug-info."
David Srbecky [Thu, 28 May 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Replace --include-cfi with --generate-debug-info."

9 years agoam c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs
Joe Fernandez [Thu, 28 May 2015 18:37:07 +0000 (18:37 +0000)]
am c8bcfe28: Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

* commit 'c8bcfe285626da3734281a17bb1748c68a33d46a':
  docs: Fix broken links on M Preview.

9 years agoam c5d3758e: docs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 18:37:02 +0000 (18:37 +0000)]
am c5d3758e: docs: Remove api-changes.html and references

* commit 'c5d3758eab49974dde9f2c3796e8abed79c69a1c':
  docs: Remove api-changes.html and references

9 years agoam 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script.
David Friedman [Thu, 28 May 2015 18:36:51 +0000 (18:36 +0000)]
am 52454e38: am bb7877c4: Docs: IO quick fix--commenting out part of script.

* commit '52454e38625e7457f645afe97ca3f666d615acc6':
  Docs: IO quick fix--commenting out part of script.

9 years agoMerge "Update asan/app_process."
Evgenii Stepanov [Thu, 28 May 2015 18:31:07 +0000 (18:31 +0000)]
Merge "Update asan/app_process."

9 years agoam 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP."...
Sanket Padawe [Thu, 28 May 2015 18:27:19 +0000 (18:27 +0000)]
am 3a017f2c: Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev

* commit '3a017f2c32eada0af896f8acb30353da05eef8e6':
  Fix display of "null" string shown in Wifi Settings for AP.

9 years agoMerge "docs: Fix broken links on M Preview." into mnc-preview-docs
Joe Fernandez [Thu, 28 May 2015 18:25:58 +0000 (18:25 +0000)]
Merge "docs: Fix broken links on M Preview." into mnc-preview-docs

9 years agoam 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev
Yin-Chia Yeh [Thu, 28 May 2015 18:21:44 +0000 (18:21 +0000)]
am 9d3df9b7: am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev

* commit '9d3df9b7bacb7ba51d337893a7b5269d69d697d1':
  Camera2: update legacy metadata

9 years agodocs: Remove api-changes.html and references
Luan Nguyen [Thu, 28 May 2015 18:19:05 +0000 (11:19 -0700)]
docs: Remove api-changes.html and references

bug: 21491968
Change-Id: I4e3c9f135cb568735bbdce999c89699ef13b4cfe

9 years agoam bb7877c4: Docs: IO quick fix--commenting out part of script.
David Friedman [Thu, 28 May 2015 18:18:47 +0000 (18:18 +0000)]
am bb7877c4: Docs: IO quick fix--commenting out part of script.

* commit 'bb7877c4fe2c70ece0ab7d596e2a01a0e7c3c0db':
  Docs: IO quick fix--commenting out part of script.

9 years agoMerge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev
Sanket Padawe [Thu, 28 May 2015 18:10:43 +0000 (18:10 +0000)]
Merge "Fix display of "null" string shown in Wifi Settings for AP." into mnc-dev

9 years agoDocs: IO quick fix--commenting out part of script.
David Friedman [Thu, 28 May 2015 18:01:31 +0000 (11:01 -0700)]
Docs: IO quick fix--commenting out part of script.

Change-Id: Iaa7aa1d5e055e8ae05c636e1504fa80261f4a78f

9 years agoIntroduce indirection for base micro themes.
Bryce Lee [Thu, 28 May 2015 18:03:57 +0000 (11:03 -0700)]
Introduce indirection for base micro themes.

This is needed, since overlays must add/modify items to base themes, but
simply declaring the style in an overlay will override the parent. To
ensure the true parent is never overridden, a base theme is introduced
that both the regular theme and the overlay can inherit from.

Bug: 21425951
Change-Id: I0967d0b4ddf12e9765bc321a7485a6dbdfef0b1e

9 years agoam 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into...
Brian Attwell [Thu, 28 May 2015 18:03:12 +0000 (18:03 +0000)]
am 701ea8b5: am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev

* commit '701ea8b5957482c0f6aabdf0d2b3c2f2ab8e5d55':
  Deprecate {READ,WRITE}_PROFILE permission

9 years agoam e886ab11: am 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image...
Luan Nguyen [Thu, 28 May 2015 18:03:06 +0000 (18:03 +0000)]
am e886ab11: am 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs

* commit 'e886ab11dc2769ad380a014129685cce1535048e':
  docs: Remove broken image link from samples.

9 years agoam f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev
Yin-Chia Yeh [Thu, 28 May 2015 18:01:57 +0000 (18:01 +0000)]
am f4b99815: Merge "Camera2: update legacy metadata" into mnc-dev

* commit 'f4b998153d4d921a64b7cfdb523cd3a97e2849a9':
  Camera2: update legacy metadata

9 years agoMerge "Camera2: update legacy metadata" into mnc-dev
Yin-Chia Yeh [Thu, 28 May 2015 17:48:16 +0000 (17:48 +0000)]
Merge "Camera2: update legacy metadata" into mnc-dev

9 years agodocs: Fix broken links on M Preview.
Luan Nguyen [Thu, 28 May 2015 17:42:26 +0000 (10:42 -0700)]
docs: Fix broken links on M Preview.

bug:21490711
Change-Id: I1608dae5518f7335b5bc366cc28ee27a73a08521

9 years agoam 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev
Brian Attwell [Thu, 28 May 2015 17:43:41 +0000 (17:43 +0000)]
am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev

* commit '8d38a8d84f3c6ee81db9e6aa38492a7ce7766206':
  Deprecate {READ,WRITE}_PROFILE permission

9 years agoam af373232: am ec7100d0: Merge "Update docstring for STRING_VVM_TYPE to point to...
Nancy Chen [Thu, 28 May 2015 17:43:36 +0000 (17:43 +0000)]
am af373232: am ec7100d0: Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev

* commit 'af3732328b5e6e9e1e13b4fc183aa01c4f959390':
  Update docstring for STRING_VVM_TYPE to point to possible values.

9 years agoam 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from...
Luan Nguyen [Thu, 28 May 2015 17:43:36 +0000 (17:43 +0000)]
am 56edce33: am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs

* commit '56edce33fb408a7ff593d1f4c8b62c252b3c45e8':
  docs: Remove broken image link from samples.

9 years agoFix display of "null" string shown in Wifi Settings for AP.
Sanket Padawe [Thu, 28 May 2015 17:41:14 +0000 (10:41 -0700)]
Fix display of "null" string shown in Wifi Settings for AP.

Bug: 21476825
Change-Id: I643dcaa3112ff896e7b0abd998f2ad5e13187706

9 years agoMerge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev
Brian Attwell [Thu, 28 May 2015 17:36:35 +0000 (17:36 +0000)]
Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev

9 years agoam 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI...
Svet Ganov [Thu, 28 May 2015 17:30:23 +0000 (17:30 +0000)]
am 73e74be1: am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev

* commit '73e74be1dc0294336b5104d6169177955b53490f':
  Add a normal permission guarding the installer UI - used for stats tracking

9 years agoam 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into...
Luan Nguyen [Thu, 28 May 2015 17:28:24 +0000 (17:28 +0000)]
am 759b1673: am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs

* commit '759b1673dd682db6dbddf8531b704dba1853ae1b':
  docs: Remove broken image link from samples.

9 years agoam ec7100d0: Merge "Update docstring for STRING_VVM_TYPE to point to possible values...
Nancy Chen [Thu, 28 May 2015 17:27:46 +0000 (17:27 +0000)]
am ec7100d0: Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev

* commit 'ec7100d0114d50f12c4ad95eaeac61e93a6d5a96':
  Update docstring for STRING_VVM_TYPE to point to possible values.

9 years agoMerge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev
Nancy Chen [Thu, 28 May 2015 17:17:17 +0000 (17:17 +0000)]
Merge "Update docstring for STRING_VVM_TYPE to point to possible values." into mnc-dev

9 years agoam c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview...
Luan Nguyen [Thu, 28 May 2015 17:11:33 +0000 (17:11 +0000)]
am c6c717d4: Merge "docs: Remove broken image link from samples." into mnc-preview-docs

* commit 'c6c717d4f5ed77cf0e11a738247dc05e751c8763':
  docs: Remove broken image link from samples.

9 years agoRevert "Revert "Remove debugging and skip InputMethod windows""
Olawale Ogunwale [Wed, 27 May 2015 18:06:11 +0000 (18:06 +0000)]
Revert "Revert "Remove debugging and skip InputMethod windows""

This reverts commit ea343e5f673e540f5d2504fe8ac17606f0bd5d94.
Reducing log spam from WM.

Change-Id: I56468a61b15d08eff1d89b0d648f29a0e868408c

9 years agoMerge "docs: Remove broken image link from samples." into mnc-preview-docs
Luan Nguyen [Thu, 28 May 2015 17:02:48 +0000 (17:02 +0000)]
Merge "docs: Remove broken image link from samples." into mnc-preview-docs

9 years agodocs: Remove broken image link from samples.
Luan Nguyen [Thu, 28 May 2015 16:59:00 +0000 (09:59 -0700)]
docs: Remove broken image link from samples.

Change-Id: Id34d14d7e1a352382eb477b2915ef0108f3f3cb0

9 years agoam 63428ccd: Merge "Add a normal permission guarding the installer UI - used for...
Svet Ganov [Thu, 28 May 2015 16:21:50 +0000 (16:21 +0000)]
am 63428ccd: Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev

* commit '63428ccde7e925ceb94aa40e933b3d51954a7797':
  Add a normal permission guarding the installer UI - used for stats tracking

9 years agoReplace --include-cfi with --generate-debug-info.
David Srbecky [Thu, 28 May 2015 16:16:09 +0000 (17:16 +0100)]
Replace --include-cfi with --generate-debug-info.

This follows a change in dex2oat.

Change-Id: I46b61298ca00bee2e83080456b180d63efd95b8f

9 years agoMerge "Add a normal permission guarding the installer UI - used for stats tracking...
Svet Ganov [Thu, 28 May 2015 15:37:04 +0000 (15:37 +0000)]
Merge "Add a normal permission guarding the installer UI - used for stats tracking" into mnc-dev

9 years agoAdd a normal permission guarding the installer UI - used for stats tracking
Svet Ganov [Thu, 28 May 2015 15:19:48 +0000 (08:19 -0700)]
Add a normal permission guarding the installer UI - used for stats tracking

bug:2147009

Change-Id: Id020eaf7b852de43966f4ab8231e3f7046e66542

9 years agoam 1bafedf1: am 16144ac3: Merge "Add comments to indicate code review was done for...
Glenn Kasten [Thu, 28 May 2015 15:20:49 +0000 (15:20 +0000)]
am 1bafedf1: am 16144ac3: Merge "Add comments to indicate code review was done for bugs" into mnc-dev

* commit '1bafedf1bc2dd5a33ed1309ca368d5bc1fc4ed3f':
  Add comments to indicate code review was done for bugs

9 years agoam 16144ac3: Merge "Add comments to indicate code review was done for bugs" into...
Glenn Kasten [Thu, 28 May 2015 15:02:50 +0000 (15:02 +0000)]
am 16144ac3: Merge "Add comments to indicate code review was done for bugs" into mnc-dev

* commit '16144ac3789f6dbe36a7011cf23305f072a7bfcb':
  Add comments to indicate code review was done for bugs

9 years agoMerge "Add comments to indicate code review was done for bugs" into mnc-dev
Glenn Kasten [Thu, 28 May 2015 14:52:35 +0000 (14:52 +0000)]
Merge "Add comments to indicate code review was done for bugs" into mnc-dev

9 years agoam 4eff15e4: am d198c60c: Merge "Fix reconfigure & setPremult alpha handling" into...
John Reck [Thu, 28 May 2015 14:49:26 +0000 (14:49 +0000)]
am 4eff15e4: am d198c60c: Merge "Fix reconfigure & setPremult alpha handling" into mnc-dev

* commit '4eff15e4806c924e1eba2831ccfe73b844cfae62':
  Fix reconfigure & setPremult alpha handling

9 years agoam 8ce35a3d: am 1d4488c8: Merge "Cache bluetooth connection state from callback"...
Jason Monk [Thu, 28 May 2015 14:49:21 +0000 (14:49 +0000)]
am 8ce35a3d: am 1d4488c8: Merge "Cache bluetooth connection state from callback" into mnc-dev

* commit '8ce35a3d8203cf2b3bb4b3e75c40a82cd4e6a8cc':
  Cache bluetooth connection state from callback

9 years agoam d198c60c: Merge "Fix reconfigure & setPremult alpha handling" into mnc-dev
John Reck [Thu, 28 May 2015 14:33:48 +0000 (14:33 +0000)]
am d198c60c: Merge "Fix reconfigure & setPremult alpha handling" into mnc-dev

* commit 'd198c60c944a946f31e151b29dd919aac71e87eb':
  Fix reconfigure & setPremult alpha handling