Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,570 Commits 3 Branches 0 Tags
bb49e8573e22cb6325dc31bf007a500fb7c136eb
Commit Graph

29016 Commits

Author SHA1 Message Date
Amith Yamasani
bb49e8573e resolved conflicts for merge of 15935aad to master 
Change-Id: I9664186a62cf7b11844c6a14967f5b8c2b67c289
 2013-03-30 19:26:37 -07:00
Amith Yamasani
15935aad3d am 42bc734b: Merge "Block access to accounts for limited users." into jb-mr2-dev 
* commit '42bc734b302f1fe68c031e013513535bed4c24f1':
  Block access to accounts for limited users.
 2013-03-30 18:34:57 -07:00
Amith Yamasani
42bc734b30 Merge "Block access to accounts for limited users." into jb-mr2-dev 2013-03-31 01:32:39 +00:00
Amith Yamasani
27db46850b Block access to accounts for limited users. 
Make sure that apps that have access to restricted accounts can see them.
If they don't have access, they shouldn't be able to add a new account either.
Show an error message in the account picker if the user/app is not authorized.

Change-Id: I117c0b14d7d06c5ac4e66506df156b174567f5f3
 2013-03-30 18:25:49 -07:00
Geremy Condra
1ad4ce693f am cac0e0b1: Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev 
* commit 'cac0e0b11ba3f9f73ddb0ab18e136d61f700c356':
  Add SELinux updater and Settings-based enforcement switch.
 2013-03-30 15:11:18 -07:00
Geremy Condra
cac0e0b11b Merge "Add SELinux updater and Settings-based enforcement switch." into jb-mr2-dev 2013-03-30 22:08:20 +00:00
Amith Yamasani
8d01846130 am 5c98b904: am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev 
* commit '5c98b9046506cc69b261dd6ac2ae39b2de0afacb':
  Improve RestrictionEntry API
 2013-03-29 18:52:58 -07:00
Amith Yamasani
5c98b90465 am 9e8ba8f2: Merge "Improve RestrictionEntry API" into jb-mr2-dev 
* commit '9e8ba8f27316c793578e68fcc6632a6ea6240f4a':
  Improve RestrictionEntry API
 2013-03-29 18:51:14 -07:00
Amith Yamasani
9e8ba8f273 Merge "Improve RestrictionEntry API" into jb-mr2-dev 2013-03-30 01:47:33 +00:00
Fabrice Di Meglio
cfa775447e am 68951ee9: am 83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev 
* commit '68951ee958e72319facc267289ca363622758e0a':
  Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
 2013-03-29 18:02:42 -07:00
Fabrice Di Meglio
68951ee958 am 83390182: Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev 
* commit '83390182bfe50a3611d78b57ab2f3a8558ede2aa':
  Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug
 2013-03-29 18:01:07 -07:00
Fabrice Di Meglio
83390182bf Merge "Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug" into jb-mr2-dev 2013-03-30 00:58:51 +00:00
Elliott Hughes
96a744cf54 am 1e61ea82: am 55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue." 
* commit '1e61ea82f423f4149fc19868fc0eca42fbb5d986':
  Clarify the documentation of SparseArray.indexOfValue.
 2013-03-29 17:58:44 -07:00
Amith Yamasani
86118baa4f Improve RestrictionEntry API 
More getters and setters, better naming.
New extra defined for returning a custom intent that handles showing the
   restrictions UI.

Change-Id: I2ee0cdb4edd99e71a9004ff5e929dbe243b45557
 2013-03-29 17:28:47 -07:00
Elliott Hughes
1e61ea82f4 am 55e9d98d: Merge "Clarify the documentation of SparseArray.indexOfValue." 
* commit '55e9d98d990f7a015d4c10f5e5a92ae131637073':
  Clarify the documentation of SparseArray.indexOfValue.
 2013-03-29 17:13:44 -07:00
Geremy Condra
77118fb55e Add SELinux updater and Settings-based enforcement switch. 
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
 2013-03-29 16:52:56 -07:00
Geremy Condra
087f6ef973 Merge "Fix a comment to fix the build." 2013-03-29 23:40:58 +00:00
Geremy Condra
757ee52725 Fix a comment to fix the build. 
Change-Id: I9acfef97572bbb0438afbc95df6a718ba506c2c4
 2013-03-29 16:39:45 -07:00
Elliott Hughes
55e9d98d99 Merge "Clarify the documentation of SparseArray.indexOfValue." 2013-03-29 23:25:07 +00:00
kmccormick
e3855b5171 am 160c0059: am 257719ec: am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit '160c0059f1499dbb7fdba7306f32227af7a15baa':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:23:53 -07:00
kmccormick
257719ec2a am cccf6e9b: am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit 'cccf6e9b85e7f9e5f404137dde5dbd9db937592b':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:18:40 -07:00
Geremy Condra
6ef7b2ff6c Merge "Add SELinux updater and Settings-based enforcement switch." 2013-03-29 23:18:20 +00:00
Geremy Condra
e9ea821475 Merge "Add ConfigUpdater settings values to the global table." 2013-03-29 23:17:03 +00:00
kmccormick
cccf6e9b85 am 9f0ed0ee: am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit '9f0ed0ee508b8f2233c8834f067e2fb8275d2cfa':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:16:10 -07:00
kmccormick
9f0ed0ee50 am 58db9597: am e4ca0650: am 31ed1722: Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 
* commit '58db95970c9ba47dd83e06cc165d2dc5cc29ce8a':
  Doc update: clarify dumpsys instructions
 2013-03-29 16:13:12 -07:00
kmccormick
31ed1722b1 Merge "Doc update: clarify dumpsys instructions" into jb-mr1.1-docs 2013-03-29 23:06:58 +00:00
Michael Wright
6f7941484b am b09b5d42: am ee5880c9: Merge "Finish any event in the current input queue" into jb-mr2-dev 
* commit 'b09b5d42ec07a050f1b27d59684393af96cd8704':
  Finish any event in the current input queue
 2013-03-29 16:06:12 -07:00
kmccormick
f6dc107809 Doc update: clarify dumpsys instructions 
"Bug: 8474578"

Change-Id: Ic743de8f41a1b2d38a4d2495148dc07e2f45b8e5
 2013-03-29 16:01:31 -07:00
Michael Wright
ee5880c95a Merge "Finish any event in the current input queue" into jb-mr2-dev 2013-03-29 22:58:50 +00:00
Geremy Condra
4e7f7e839e Add SELinux updater and Settings-based enforcement switch. 
Bug: 8116902
Change-Id: Ifac495026a354dac7655c28ea2188499a2a319aa
 2013-03-29 15:48:15 -07:00
Geremy Condra
a0735118c6 Add ConfigUpdater settings values to the global table. 
This is a partial fix to a bug caused by not properly migrating
these values from secure: to global:

Change-Id: Iaed77b5ab671f9cd229c7883ae09a0b4a5f3c64e
 2013-03-29 15:48:07 -07:00
kmccormick
8594fab800 am 306a5d0f: am da160ec3: am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit '306a5d0fe7654653dd97a630ef8eac1fff71d78b':
  Doc update: incorrect method name
 2013-03-29 15:02:40 -07:00
kmccormick
da160ec313 am 6eebd6e6: am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit '6eebd6e6b44d7688489c430cad933e971530e43d':
  Doc update: incorrect method name
 2013-03-29 14:51:25 -07:00
kmccormick
6eebd6e6b4 am 6f50c846: am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit '6f50c846ad46dfeadf8eac389102031662ad892f':
  Doc update: incorrect method name
 2013-03-29 14:48:35 -07:00
kmccormick
6f50c846ad am d2c1e947: am 39f864b1: am 5018688b: Merge "Doc update: incorrect method name" into jb-mr1.1-docs 
* commit 'd2c1e947ea27ccea8060b0ef4509b3d6c90c4c51':
  Doc update: incorrect method name
 2013-03-29 14:46:53 -07:00
kmccormick
5018688b69 Merge "Doc update: incorrect method name" into jb-mr1.1-docs 2013-03-29 21:38:49 +00:00
Kenny Root
eda7cb0ce8 am 9759a476: am b3817722: Merge "KeyStore: add API to query storage type" into jb-mr2-dev 
* commit '9759a47650cfd8624f49eb1f152fd900921f3d6e':
  KeyStore: add API to query storage type
 2013-03-29 14:36:33 -07:00
Jatin Lodhia
278700fdb9 am 98c762bf: am ce66fd74: Merge "AccountManager changes for profile seeding." into jb-mr2-dev 
* commit '98c762bf7cd291e4ae3d9923a8feb3389855ecff':
  AccountManager changes for profile seeding.
 2013-03-29 14:36:14 -07:00
Raph Levien
85973db79d am 0a914107: am 8fed6bc8: Merge "Make zero width space a line breaker" into jb-mr2-dev 
* commit '0a914107205981a8baa079736c959ea9abedbf50':
  Make zero width space a line breaker
 2013-03-29 14:34:46 -07:00
kmccormick
f783ce5bcf Doc update: incorrect method name 
"Bug: 8177983"

Change-Id: Ib8f811a8e82dbff9b4e97cb670dec66342a0df00
 2013-03-29 14:33:21 -07:00
Kenny Root
b381772246 Merge "KeyStore: add API to query storage type" into jb-mr2-dev 2013-03-29 21:24:35 +00:00
Kenny Root
5cb5cec6a4 KeyStore: add API to query storage type 
Add an API to keystore daemon to query what kind of storage is currently
in use.

(cherry picked from commit a738e2a1ae)

Change-Id: I52c84449a27b1cefc49372a6406b7132c2bbddee
 2013-03-29 14:21:10 -07:00
Michael Wright
bf02096088 Finish any event in the current input queue 
When the pipelining optimization was added we never updated
handleImeFinishedEvent to look through the whole queue of items, so it was only
looking at the head.

Bug: 8498214
Change-Id: I79c62392a93b47e3e1eab3f4fe54a5c999dfb566
 2013-03-29 14:06:43 -07:00
Jatin Lodhia
ce66fd7479 Merge "AccountManager changes for profile seeding." into jb-mr2-dev 2013-03-29 20:44:49 +00:00
Fabrice Di Meglio
b365f91688 Optimize ViewGroup.MarginLayoutParams memory and fix ViewDebug 
- use private flag bit field for ViewGroup.MarginLayoutParams
- make ViewDebug support "byte" type for FlagMapping

Change-Id: Iff7c31544e3ce2d29919c9424425f2bf87042b8b
 2013-03-29 13:12:07 -07:00
Kenny Root
a738e2a1ae KeyStore: add API to query storage type 
Add an API to keystore daemon to query what kind of storage is currently
in use.

Change-Id: I5a83ae92250ca63b691dcf1beb8b3e1703797745
 2013-03-29 11:16:43 -07:00
Raph Levien
8fed6bc894 Merge "Make zero width space a line breaker" into jb-mr2-dev 2013-03-29 16:58:33 +00:00
Raph Levien
8d087c349f Make zero width space a line breaker 
This patch makes ZWSP (U+200B, zero width space) a potential line break
in text layouts. This is a fix for bug 8501809.

Change-Id: I18c1f8464e6c821ff75f819141bacc714a878700
 2013-03-29 09:25:48 -07:00
kmccormick
58367ad362 am 8706df1c: am 326e8bf8: am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '8706df1cb7a3964d9a6570a795368f4a78a58cf7':
  Doc update: clarify rules for rate param
 2013-03-28 18:15:02 -07:00
kmccormick
326e8bf826 am 84bba952: am 297409fe: am 3abd5a00: am ef47a8c4: am 6d9ff503: Merge "Doc update: clarify rules for rate param" into jb-mr1.1-docs 
* commit '84bba9528c5d3baf22656746255b74e72b4555ff':
  Doc update: clarify rules for rate param
 2013-03-28 18:10:08 -07:00