Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
197,591 Commits 3 Branches 0 Tags
db19e1ded0d9bec62e798c6ba7677eefa4ff7c64
Commit Graph

197591 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
db19e1ded0 Merge "Fix the build" into mnc-dr-dev 2015-07-15 23:32:39 +00:00
Jim Miller
de5b573e2a Fix the build 
Build broken due to a bad merge.

Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
 2015-07-15 16:29:30 -07:00
Svetoslav
eb16e1fb22 am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev 
* commit '08dda27be4678f2ab5bdc7e210d511ec105c158c':
  Make sure we get valid package name or fail.
 2015-07-15 23:13:03 +00:00
Christopher Tate
b6b97e90cb am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev 
* commit '06476508c4aae6b9bb5affdc7470abf159ef9eda':
  Resolve based on the correct user's default browser
 2015-07-15 23:12:59 +00:00
Svetoslav
08dda27be4 Merge "Make sure we get valid package name or fail." into mnc-dev 2015-07-15 23:03:49 +00:00
Svetoslav
7395cbf070 Make sure we get valid package name or fail. 
bug:22492225

Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
 2015-07-15 15:58:44 -07:00
Christopher Tate
06476508c4 Merge "Resolve based on the correct user's default browser" into mnc-dev 2015-07-15 22:57:53 +00:00
Abodunrinwa Toki
b277786736 am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 
* commit '6a4014104e85bf4154b353cd0be337f7967cdaeb':
  Let the ActionBar handle keyboard shortcuts.
 2015-07-15 22:50:16 +00:00
Abodunrinwa Toki
6a4014104e Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev 2015-07-15 22:39:21 +00:00
Miao Wang
675bed5488 am ad904cf3: Merge "fix BNNM docs" into mnc-dev 
* commit 'ad904cf34219897da731eb65f9de53176cc39b20':
  fix BNNM docs
 2015-07-15 22:34:47 +00:00
Svet Ganov
12b05ec2e7 am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev 
* commit '75f6b94a5d5cadb218725011729466e8e438b231':
  Grant default permissions to the setup app robustly.
 2015-07-15 22:28:10 +00:00
Geoff Mendal
76b8b1e663 am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
  Import translations. DO NOT MERGE
 2015-07-15 22:28:06 +00:00
Adrian Roos
2fc6e2b57d am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev 
* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones
 2015-07-15 22:28:02 +00:00
Geoff Mendal
9139d5b0fd am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:58 +00:00
Geoff Mendal
f88916cabc am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '197e7381576bee4b8e2e7195811fe94d1b1b28ec':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:54 +00:00
Geoff Mendal
ccec9777f4 am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '6e149a2537167f90b1db2430c19ccdf064548b91':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:44 +00:00
Geoff Mendal
f48b416e98 am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:39 +00:00
Geoff Mendal
0959738e5c am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:35 +00:00
Geoff Mendal
2e51738d7c am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '36c103d685a6ba0f04c52bad2cb666789f5179dc':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:31 +00:00
Geoff Mendal
f427688c37 am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
  Import translations. DO NOT MERGE
 2015-07-15 22:27:26 +00:00
Jorim Jaggi
7be40aaa6b am eea8be53: Adjust assist disclosure stroke width to spec 
* commit 'eea8be533874f279016279cd68618a6592b3dbed':
  Adjust assist disclosure stroke width to spec
 2015-07-15 22:27:07 +00:00
Roshan Pius
06179c75c8 am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev 
* commit '4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
  Handle exceptions when accessing Content providers.
 2015-07-15 22:26:55 +00:00
Felipe Leme
d9ab0ca287 am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev 
* commit '68fd7c798d213bbe304775b13d775ee868abb448':
  Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
 2015-07-15 22:26:47 +00:00
Dianne Hackborn
4a56983fa7 am d193916c: Merge "Fix build." into mnc-dev 
* commit 'd193916c83015d54466ad998fb9373f15da754a7':
  Fix build.
 2015-07-15 22:26:42 +00:00
Jeff Brown
0cb1cfdcc3 am 76c4c666: Add USB port manager. 
* commit '76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
  Add USB port manager.
 2015-07-15 22:26:38 +00:00
Jeff Brown
b3c1180538 am 2dbccc19: Clean up USB Manager dump. 
* commit '2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
  Clean up USB Manager dump.
 2015-07-15 22:26:34 +00:00
Miao Wang
ad904cf342 Merge "fix BNNM docs" into mnc-dev 2015-07-15 22:21:13 +00:00
Svet Ganov
75f6b94a5d Merge "Grant default permissions to the setup app robustly." into mnc-dev 2015-07-15 21:58:50 +00:00
Geoff Mendal
78b6e6c742 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:56:27 +00:00
Adrian Roos
3a931d028a Merge "Show correct locked orientation on phones" into mnc-dev 2015-07-15 21:56:27 +00:00
Geoff Mendal
4155d9f377 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:56:05 +00:00
Geoff Mendal
197e738157 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:54:09 +00:00
Christopher Tate
7991f7813e Resolve based on the correct user's default browser 
Bug 22509659

Change-Id: Iac75e7b40609bf2c81d266e0568fbfbeb71bb3aa
 2015-07-15 14:52:29 -07:00
Geoff Mendal
6e149a2537 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:51:04 +00:00
Geoff Mendal
a5516e80ad Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:48:35 +00:00
Geoff Mendal
ff994bd31b Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:47:14 +00:00
Svet Ganov
50a8bf4da0 Grant default permissions to the setup app robustly. 
There is a zoo of components that handle the home intent and
have different priority. There is no reliable way to distinguish
the setup app from the other apps that handle home as some of
them have lower priority than the setup app and some higher.
This change adds a dedicated category to recognize the default
setup app.

Uncommented the code that grants accounts permissions as the
get_accounts permission is now a runtime permission and can be
granted.

bug:22471024
bug:22501463

Change-Id: I41726751fa2567cbcd7d09c7acfa7615b8aba577
 2015-07-15 14:46:23 -07:00
Geoff Mendal
36c103d685 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:44:12 +00:00
Jeff Sharkey
6819696c0e am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev 
* commit '539f7ac7a195c405987057ef34e88cfbe8eab5e8':
  Give DCS permission needed to measure all users.
 2015-07-15 21:43:55 +00:00
Jeff Sharkey
350b99c002 am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev 
* commit '483bd84280ef667e306ec7246d85423ca6b1fde7':
  Only send EXTRA_STACK for private intent.
 2015-07-15 21:43:48 +00:00
Geoff Mendal
e2a0d44c8a Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-07-15 21:41:17 +00:00
Jim Miller
c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev 
Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a
 2015-07-15 14:33:10 -07:00
Geoff Mendal
6289ad5d8f Import translations. DO NOT MERGE 
Change-Id: I428e579d5968139dcdf6e8e693f4d2eef182c682
Auto-generated-cl: translation import
 2015-07-15 14:19:57 -07:00
Geoff Mendal
703170645d Import translations. DO NOT MERGE 
Change-Id: I7e22afc43c9029b40ba2df53dfc10a9a688c4fd2
Auto-generated-cl: translation import
 2015-07-15 14:17:17 -07:00
Jorim Jaggi
eea8be5338 Adjust assist disclosure stroke width to spec 
Bug: 21568059
Change-Id: Ib1ddb8890715b98d36ed5827f053970a9d4a7173
 2015-07-15 21:09:47 +00:00
Geoff Mendal
32a7073d44 Import translations. DO NOT MERGE 
Change-Id: I376fa651ad29df01e4a7844a9e64508f4b163cf0
Auto-generated-cl: translation import
 2015-07-15 14:07:29 -07:00
Geoff Mendal
e594671cca Import translations. DO NOT MERGE 
Change-Id: I2960b24e8ab390425898ac33034b24ceae260a65
Auto-generated-cl: translation import
 2015-07-15 14:02:08 -07:00
Geoff Mendal
c74de15bad Import translations. DO NOT MERGE 
Change-Id: I5a4734ab26f74e593ace500f8ff19d280cf7a6a1
Auto-generated-cl: translation import
 2015-07-15 13:59:16 -07:00
Geoff Mendal
cddce6b6cb Import translations. DO NOT MERGE 
Change-Id: I4f6e47dc83c9fea23c61f43f791460d4bc5cc4ca
Auto-generated-cl: translation import
 2015-07-15 13:56:28 -07:00
Geoff Mendal
5b84a9623d Import translations. DO NOT MERGE 
Change-Id: I37b181b340777aed3cb07cfb88c0e69803f4826a
Auto-generated-cl: translation import
 2015-07-15 13:50:55 -07:00